diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index 5c1c6151c29..fb4fc1c9436 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2010/07/25 08:15:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/09/30 07:36:44 ajacoutot Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
 GNOME_PROJECT=	gnome-screensaver
-GNOME_VERSION=	2.30.0
-REVISION=	2
+GNOME_VERSION=	2.30.2
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,7 +20,7 @@ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs startup-notification-1
 WANTLIB += xcb xcb-atom xcb-aux xcb-event xkbfile xklavier xml2
 WANTLIB += z xcb-render xcb-render-util gnome-desktop-2 gnome-menu
-WANTLIB += gnomekbdui gnomekbd notify
+WANTLIB += gnomekbdui gnomekbd notify drm
 
 MODULES=	devel/gettext \
 		x11/gnome \
@@ -39,7 +38,7 @@ RUN_DEPENDS=	::x11/gnome/librsvg \
 		:notification-daemon-*|notification-daemon-xfce-*|xfce4-notifyd-*:sysutils/notification-daemon
 
 CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.65
+AUTOCONF_VERSION= 2.64
 MODGCONF2_SCHEMAS_DIR= gnome-screensaver
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome/screensaver/distinfo b/x11/gnome/screensaver/distinfo
index 0e8c0690837..83220789ed8 100644
--- a/x11/gnome/screensaver/distinfo
+++ b/x11/gnome/screensaver/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-screensaver-2.30.0.tar.bz2) = oYCGvyGReV2Ht+qAt7Ztqg==
-RMD160 (gnome/gnome-screensaver-2.30.0.tar.bz2) = ZyzP7AxX+sRYXSmZd7kUKnrMHI0=
-SHA1 (gnome/gnome-screensaver-2.30.0.tar.bz2) = TOtE0X2Mb/Ey5nhefnxvSNcDnh0=
-SHA256 (gnome/gnome-screensaver-2.30.0.tar.bz2) = 9lPT5Khy1DW86ddOqNFOVAkMTIA1IdX+lA6UjB3MwGA=
-SIZE (gnome/gnome-screensaver-2.30.0.tar.bz2) = 4803639
+MD5 (gnome/gnome-screensaver-2.30.2.tar.bz2) = D75uYQ5oR6weadSbHh8Fgg==
+RMD160 (gnome/gnome-screensaver-2.30.2.tar.bz2) = GxNyLzvrynCbn0TEXpldB+1sIEQ=
+SHA1 (gnome/gnome-screensaver-2.30.2.tar.bz2) = +dfA3w76ppFgmcpWB42os29MSTU=
+SHA256 (gnome/gnome-screensaver-2.30.2.tar.bz2) = 3VLvJ4sj7Fq+WXRUjC1XburrUpTIXp8u/WIx7MnKCfo=
+SIZE (gnome/gnome-screensaver-2.30.2.tar.bz2) = 4814653
diff --git a/x11/gnome/screensaver/patches/patch-config_h_in b/x11/gnome/screensaver/patches/patch-config_h_in
index 2aa9f3555cf..8a47716145e 100644
--- a/x11/gnome/screensaver/patches/patch-config_h_in
+++ b/x11/gnome/screensaver/patches/patch-config_h_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config_h_in,v 1.4 2010/04/23 11:56:09 ajacoutot Exp $
---- config.h.in.orig	Tue Mar 30 17:17:30 2010
-+++ config.h.in	Fri Apr 23 13:41:53 2010
+$OpenBSD: patch-config_h_in,v 1.5 2010/09/30 07:36:45 ajacoutot Exp $
+--- config.h.in.orig	Wed Sep 29 00:44:32 2010
++++ config.h.in	Thu Sep 30 08:17:25 2010
 @@ -12,6 +12,9 @@
  /* Define to 1 if you have the `bind_textdomain_codeset' function. */
  #undef HAVE_BIND_TEXTDOMAIN_CODESET
@@ -11,13 +11,3 @@ $OpenBSD: patch-config_h_in,v 1.4 2010/04/23 11:56:09 ajacoutot Exp $
  /* Define to 1 if you have the `clearenv' function. */
  #undef HAVE_CLEARENV
  
-@@ -168,9 +171,6 @@
- 
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
--
--/* Define to the home page for this package. */
--#undef PACKAGE_URL
- 
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
diff --git a/x11/gnome/screensaver/patches/patch-configure_ac b/x11/gnome/screensaver/patches/patch-configure_ac
index dc98d1ece12..b0eead3ab4f 100644
--- a/x11/gnome/screensaver/patches/patch-configure_ac
+++ b/x11/gnome/screensaver/patches/patch-configure_ac
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.3 2010/04/23 11:56:09 ajacoutot Exp $
---- configure.ac.orig	Tue Mar 30 17:16:51 2010
-+++ configure.ac	Fri Apr 23 13:41:53 2010
-@@ -625,6 +625,7 @@ have_shadow_enhanced=no
+$OpenBSD: patch-configure_ac,v 1.4 2010/09/30 07:36:45 ajacoutot Exp $
+--- configure.ac.orig	Wed Sep 29 00:40:53 2010
++++ configure.ac	Thu Sep 30 07:58:28 2010
+@@ -630,6 +630,7 @@ have_shadow_enhanced=no
  have_shadow_adjunct=no
  have_shadow_hpux=no
  have_passwd_helper=no
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2010/04/23 11:56:09 ajacoutot Exp $
  
  with_shadow_req=unspecified
  
-@@ -841,6 +842,44 @@ esac
+@@ -846,6 +847,44 @@ esac
  AM_CONDITIONAL(HAVE_PASSWD_HELPER, test x$have_passwd_helper = xyes)
  AC_SUBST(HAVE_PASSWD_HELPER)
  
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2010/04/23 11:56:09 ajacoutot Exp $
  if test "$need_setuid" = yes -a "$have_pam" != yes ; then
    NEED_SETUID=yes
  else
-@@ -853,7 +892,7 @@ dnl  Authentication scheme
+@@ -858,7 +897,7 @@ dnl  Authentication scheme
  dnl ---------------------------------------------------------------------------
  
  AC_ARG_ENABLE(authentication-scheme,
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2010/04/23 11:56:09 ajacoutot Exp $
                            authentication scheme [default=auto]],,
    enable_authentication_scheme=auto)
  
-@@ -865,11 +904,16 @@ fi
+@@ -870,11 +909,16 @@ fi
  if test x$enable_authentication_scheme = xhelper -a x$have_passwd_helper = xno ; then
  	AC_MSG_ERROR(Password helper support requested but not available)
  fi
@@ -80,7 +80,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2010/04/23 11:56:09 ajacoutot Exp $
  elif test x$enable_authentication_scheme = xpwent ; then
          AUTH_SCHEME="pwent"
  elif test x$enable_authentication_scheme = xauto ; then
-@@ -877,6 +921,8 @@ elif test x$enable_authentication_scheme = xauto ; the
+@@ -882,6 +926,8 @@ elif test x$enable_authentication_scheme = xauto ; the
  		AUTH_SCHEME="pam"
  	elif test x$have_passwd_helper != xno ; then
  		AUTH_SCHEME="helper"
diff --git a/x11/gnome/screensaver/pkg/PLIST b/x11/gnome/screensaver/pkg/PLIST
index 461437aa706..a4e6667f0dc 100644
--- a/x11/gnome/screensaver/pkg/PLIST
+++ b/x11/gnome/screensaver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/04/28 15:18:32 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2010/09/30 07:36:45 ajacoutot Exp $
 @bin bin/gnome-screensaver
 @bin bin/gnome-screensaver-command
 @bin bin/gnome-screensaver-preferences
@@ -31,6 +31,7 @@ share/backgrounds/cosmos/helix-nebula.jpg
 share/backgrounds/cosmos/jupiter.jpg
 share/backgrounds/cosmos/sombrero.jpg
 share/backgrounds/cosmos/whirlpool.jpg
+share/dbus-1/services/org.gnome.ScreenSaver.service
 share/desktop-directories/
 share/desktop-directories/gnome-screensaver.directory
 share/doc/gnome-screensaver/