diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index d2cad28a716..73b83bd6606 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/11/29 11:34:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2008/11/29 12:11:19 ajacoutot Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
 GNOME_PROJECT=	gnome-screensaver
 GNOME_VERSION=	2.24.1
+PKGNAME=	${DISTNAME}p0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/screensaver/patches/patch-data_lock-dialog-default_glade b/x11/gnome/screensaver/patches/patch-data_lock-dialog-default_glade
new file mode 100644
index 00000000000..9cd36c98b95
--- /dev/null
+++ b/x11/gnome/screensaver/patches/patch-data_lock-dialog-default_glade
@@ -0,0 +1,22 @@
+$OpenBSD: patch-data_lock-dialog-default_glade,v 1.1 2008/11/29 12:11:19 ajacoutot Exp $
+--- data/lock-dialog-default.glade.orig	Sat Nov 29 12:49:51 2008
++++ data/lock-dialog-default.glade	Sat Nov 29 12:50:10 2008
+@@ -315,18 +315,6 @@
+ 		      </child>
+ 
+ 		      <child>
+-			<widget class="GtkButton" id="auth-switch-button">
+-			  <property name="visible">True</property>
+-			  <property name="can_default">True</property>
+-			  <property name="can_focus">True</property>
+-			  <property name="label" translatable="yes">_Switch User</property>
+-			  <property name="use_underline">True</property>
+-			  <property name="relief">GTK_RELIEF_NORMAL</property>
+-			  <property name="focus_on_click">False</property>
+-			</widget>
+-		      </child>
+-
+-		      <child>
+ 			<widget class="GtkButton" id="auth-logout-button">
+ 			  <property name="visible">True</property>
+ 			  <property name="can_default">True</property>