diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile
index 75d714ed831..1591a44f0a9 100644
--- a/x11/gnome/desktop/Makefile
+++ b/x11/gnome/desktop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2011/04/05 16:37:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.67 2011/05/08 17:45:48 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		components for the GNOME desktop
 GNOME_PROJECT=		gnome-desktop
 GNOME_VERSION=		2.32.1
 
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=  gnome-desktop-2      8.0      # .15.2
 
@@ -19,15 +19,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo
-WANTLIB += execinfo expat fontconfig freetype
+WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
+WANTLIB += atk-1.0 cairo drm execinfo expat fontconfig freetype
 WANTLIB += gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread-stubs xcb xcb-atom xcb-aux xcb-event
-WANTLIB += xcb-render  z startup-notification-1
-WANTLIB += GL Xxf86vm drm xcb-shm
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
+WANTLIB += startup-notification-1 xcb xcb-atom xcb-aux xcb-event
+WANTLIB += xcb-render xcb-shm z
 
 MODULES=		devel/gettext \
 			lang/python \
@@ -35,7 +34,8 @@ MODULES=		devel/gettext \
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		x11/gnome/py-gnome
-LIB_DEPENDS=		devel/startup-notification
+LIB_DEPENDS=		devel/gconf2 \
+			devel/startup-notification
 
 MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
diff --git a/x11/gnome/libgnomekbd/Makefile b/x11/gnome/libgnomekbd/Makefile
index 45cd6f44f1e..7c21fbdcfc6 100644
--- a/x11/gnome/libgnomekbd/Makefile
+++ b/x11/gnome/libgnomekbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/11/22 08:36:57 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2011/05/08 17:45:48 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		keyboard configuration library
 
 GNOME_PROJECT=		libgnomekbd
 GNOME_VERSION=		2.32.0
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=	gnomekbd             4.0      # .5.0
 SHARED_LIBS +=	gnomekbdui           4.0      # .5.0
@@ -19,13 +19,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo
-WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
+WANTLIB += c cairo drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
-WANTLIB += xcb-render-util xkbfile xml2 z xklavier
+WANTLIB += xcb-shm xkbfile xklavier xml2 z
 
 MODULES=		devel/gettext \
 			x11/gnome \
diff --git a/x11/gnome/libgnomeui/Makefile b/x11/gnome/libgnomeui/Makefile
index 17f6b03480d..1fee0eb8da8 100644
--- a/x11/gnome/libgnomeui/Makefile
+++ b/x11/gnome/libgnomeui/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2011/03/07 19:32:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2011/05/08 17:45:48 jasper Exp $
 
 COMMENT=		user interface components for GNOME
 
 GNOME_PROJECT=		libgnomeui
 GNOME_VERSION=		2.24.5
+REVISION=		0
 
 SHARED_LIBS +=	gnomeui-2      2400.0         # .2400.2
 
@@ -23,7 +24,7 @@ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png popt pthread-stubs ssl util xcb xml2
 WANTLIB += gcrypt gpg-error xcb-render GL Xxf86vm drm xcb-shm
 WANTLIB += gnome-keyring>=6 gnome-2 gnomecanvas-2 bonoboui-2
-WANTLIB += canberra ltdl ogg pthread vorbis vorbisfile z
+WANTLIB += canberra ltdl ogg vorbis vorbisfile z
 
 MODULES=	devel/gettext \
 		x11/gnome
diff --git a/x11/gnome/settings-daemon/Makefile b/x11/gnome/settings-daemon/Makefile
index 5442d08df03..f84dd017744 100755
--- a/x11/gnome/settings-daemon/Makefile
+++ b/x11/gnome/settings-daemon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2011/05/04 05:12:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.44 2011/05/08 17:45:48 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT=	GNOME settings daemon
 GNOME_PROJECT=	gnome-settings-daemon
 GNOME_VERSION=	2.32.1
 
-REVISION=	3
+REVISION=	4
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -35,7 +35,8 @@ BUILD_DEPENDS=	textproc/rarian
 LIB_DEPENDS=	devel/libnotify>=0.7.2 \
 		x11/gnome/desktop \
 		x11/gnome/libgnomekbd \
-		sysutils/polkit
+		sysutils/polkit \
+		security/nss
 
 # otherwise we end up without icons on minimal install
 RUN_DEPENDS=	x11/gnome/icon-theme