diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index 47fbebe546a..3f53edb21d3 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.36 2011/09/26 06:38:48 ajacoutot Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
 GNOME_PROJECT=	gnome-screensaver
-GNOME_VERSION=	3.0.1
-REVISION=	0
+GNOME_VERSION=	3.2.0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -12,16 +11,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
-WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86misc
+WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86misc
 WANTLIB += Xxf86vm atk-1.0 c cairo cairo-gobject dbus-1 dbus-glib-1
-WANTLIB += drm execinfo expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3
-WANTLIB += gnomekbd gnomekbdui gobject-2.0 gthread-2.0 gtk-3 m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread pthread-stubs startup-notification-1 xcb
-WANTLIB += xcb-aux xcb-render xcb-shm xkbfile
-WANTLIB += xklavier xml2 z
+WANTLIB += drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gnomekbd
+WANTLIB += gnomekbdui gobject-2.0 gthread-2.0 gtk-3 kvm m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB += pthread-stubs xcb xcb-render xcb-shm xkbfile xklavier
+WANTLIB += xml2 z
 
 MODULES=	devel/gettext \
 		x11/gnome \
@@ -49,11 +47,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-mit-ext \
 		--with-xf86gamma-ext
 
-# configure switch is still here, but functionnality has been removed
-# --with-kbd-layout-indicator
-
-USE_GROFF=	Yes
-
 MAKE_FLAGS=	DOCDIR="${PREFIX}/share/doc/gnome-screensaver"
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/gnome-xscreensaver
 
diff --git a/x11/gnome/screensaver/distinfo b/x11/gnome/screensaver/distinfo
index c91858b582f..6423020456c 100644
--- a/x11/gnome/screensaver/distinfo
+++ b/x11/gnome/screensaver/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-screensaver-3.0.1.tar.xz) = tS3mSNaVuSOZjfmo2iUi+A==
-RMD160 (gnome/gnome-screensaver-3.0.1.tar.xz) = BdzHziwIoeARbAA0X5hNqlUYsCY=
-SHA1 (gnome/gnome-screensaver-3.0.1.tar.xz) = tsTktYy5GALpAEE2hgS89JvbwzI=
-SHA256 (gnome/gnome-screensaver-3.0.1.tar.xz) = J9cA6vp7II14mefiUDUO1gLqz+pYpRtQ37o21k3HtvE=
-SIZE (gnome/gnome-screensaver-3.0.1.tar.xz) = 568240
+MD5 (gnome/gnome-screensaver-3.2.0.tar.xz) = U/3P84j628eIVxckh01atg==
+RMD160 (gnome/gnome-screensaver-3.2.0.tar.xz) = yyHZWWF2P8uDGpsSk1acBLw96ss=
+SHA1 (gnome/gnome-screensaver-3.2.0.tar.xz) = ach81g92o6ZiaXDD3T/Y9y/aVC8=
+SHA256 (gnome/gnome-screensaver-3.2.0.tar.xz) = MF9KW+hzbEz15VuCiLfhd5B7r6JuOSc9G7Za0YYile0=
+SIZE (gnome/gnome-screensaver-3.2.0.tar.xz) = 566084