diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 3ba5fdde5e3..7da200d2fa6 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.73 2011/12/30 11:15:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.74 2012/03/23 13:24:10 ajacoutot Exp $
 
 COMMENT-main=	configuration database system for GNOME
 COMMENT-polkit=	PolicyKit integration for GConf2
 
 GNOME_PROJECT=	GConf
-GNOME_VERSION=	3.2.3
+GNOME_VERSION=	3.2.5
 PKGNAME=	gconf2-${GNOME_VERSION}
 
 PKGNAME-main=	gconf2-${GNOME_VERSION}
 PKGNAME-polkit=	gconf2-polkit-${GNOME_VERSION}
 
-REVISION-main=	1
-
 SHARED_LIBS +=	gconf-2              6.2      # 5.5
 
 CATEGORIES=	devel
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 67bd140ad8d..ea78041060d 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,5 +1,5 @@
-MD5 (GConf-3.2.3.tar.xz) = 3pBHwI0/ZCxbGZCwvvRFdw==
-RMD160 (GConf-3.2.3.tar.xz) = k7OB3PeHnv2LrFLG7bduIOwVwT8=
-SHA1 (GConf-3.2.3.tar.xz) = 36h6LfMfh86TcL04oXkIJ4kqd74=
-SHA256 (GConf-3.2.3.tar.xz) = nrVd0dAJtuupwy4/rofTqkWjNiml4gMe2fWssF76oUk=
-SIZE (GConf-3.2.3.tar.xz) = 1535476
+MD5 (GConf-3.2.5.tar.xz) = G4A+tPhXbFctByaSz0DJ2A==
+RMD160 (GConf-3.2.5.tar.xz) = hIbVw4VI9YHd389XWnoyFFeV2pw=
+SHA1 (GConf-3.2.5.tar.xz) = NAs8tjTvZPDDGvnZcdTz2pXReHw=
+SHA256 (GConf-3.2.5.tar.xz) = Td6pUDohLuEmxbRqCpWP1UhFdMPLbvK6842wLoGeWMY=
+SIZE (GConf-3.2.5.tar.xz) = 1525188
diff --git a/devel/gconf2/patches/patch-defaults_Makefile_in b/devel/gconf2/patches/patch-defaults_Makefile_in
index 39b68c1c4d8..5d3311ad75e 100644
--- a/devel/gconf2/patches/patch-defaults_Makefile_in
+++ b/devel/gconf2/patches/patch-defaults_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-defaults_Makefile_in,v 1.6 2011/10/31 16:29:56 ajacoutot Exp $
---- defaults/Makefile.in.orig	Mon Oct 31 16:30:46 2011
-+++ defaults/Makefile.in	Mon Oct 31 17:05:23 2011
-@@ -316,7 +316,7 @@ gconf_defaults_mechanism_SOURCES = \
+$OpenBSD: patch-defaults_Makefile_in,v 1.7 2012/03/23 13:24:10 ajacoutot Exp $
+--- defaults/Makefile.in.orig	Sat Mar 10 23:58:21 2012
++++ defaults/Makefile.in	Sat Mar 17 08:13:49 2012
+@@ -328,7 +328,7 @@ gconf_defaults_mechanism_SOURCES = \
  INCLUDES = \
  	-I$(top_srcdir) \
  	-I$(top_builddir) \
diff --git a/devel/gconf2/patches/patch-gconf_Makefile_in b/devel/gconf2/patches/patch-gconf_Makefile_in
index cb62de8487d..d1ba9a398fa 100644
--- a/devel/gconf2/patches/patch-gconf_Makefile_in
+++ b/devel/gconf2/patches/patch-gconf_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gconf_Makefile_in,v 1.19 2011/10/31 16:29:56 ajacoutot Exp $
---- gconf/Makefile.in.orig	Mon Oct 31 16:30:47 2011
-+++ gconf/Makefile.in	Mon Oct 31 17:05:23 2011
-@@ -388,7 +388,7 @@ INCLUDES = \
+$OpenBSD: patch-gconf_Makefile_in,v 1.20 2012/03/23 13:24:10 ajacoutot Exp $
+--- gconf/Makefile.in.orig	Sat Mar 10 23:58:21 2012
++++ gconf/Makefile.in	Sat Mar 17 08:13:49 2012
+@@ -400,7 +400,7 @@ INCLUDES = \
  	-DGCONF_LOCALE_DIR=\""$(datadir)/locale"\"			\
          -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"			\
  	-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"		\
diff --git a/devel/gconf2/patches/patch-gconf_gconfd_c b/devel/gconf2/patches/patch-gconf_gconfd_c
index fa18b8bb882..999762ba398 100644
--- a/devel/gconf2/patches/patch-gconf_gconfd_c
+++ b/devel/gconf2/patches/patch-gconf_gconfd_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gconf_gconfd_c,v 1.6 2011/10/26 17:12:52 ajacoutot Exp $
---- gconf/gconfd.c.orig	Wed Oct 26 17:32:15 2011
-+++ gconf/gconfd.c	Wed Oct 26 19:05:54 2011
-@@ -691,7 +691,7 @@ system_bus_message_handler (DBusConnection *connection
+$OpenBSD: patch-gconf_gconfd_c,v 1.7 2012/03/23 13:24:10 ajacoutot Exp $
+--- gconf/gconfd.c.orig	Wed Mar  7 19:08:55 2012
++++ gconf/gconfd.c	Sat Mar 17 08:13:49 2012
+@@ -709,7 +709,7 @@ system_bus_message_handler (DBusConnection *connection
  
  	  gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");