diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 0ea7f5e185c..79600ceef2f 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2013/01/22 06:10:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.79 2013/02/06 14:29:49 ajacoutot Exp $
 
 COMMENT-main=	configuration database system for GNOME
 COMMENT-polkit=	PolicyKit integration for GConf2
@@ -10,6 +10,8 @@ PKGNAME=	gconf2-${GNOME_VERSION}
 PKGNAME-main=	gconf2-${GNOME_VERSION}
 PKGNAME-polkit=	gconf2-polkit-${GNOME_VERSION}
 
+REVISION-main=	0
+
 SHARED_LIBS +=	gconf-2              6.2      # 5.5
 
 CATEGORIES=	devel
diff --git a/devel/gconf2/patches/patch-gsettings_gsettings-data-convert_c b/devel/gconf2/patches/patch-gsettings_gsettings-data-convert_c
new file mode 100644
index 00000000000..26722a932db
--- /dev/null
+++ b/devel/gconf2/patches/patch-gsettings_gsettings-data-convert_c
@@ -0,0 +1,37 @@
+$OpenBSD: patch-gsettings_gsettings-data-convert_c,v 1.1 2013/02/06 14:29:50 ajacoutot Exp $
+
+From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Wed, 23 Jan 2013 07:11:18 +0000
+Subject: mconvert: enable recursive scheme lookup and fix a crasher
+
+--- gsettings/gsettings-data-convert.c.orig	Tue Apr 10 01:58:44 2012
++++ gsettings/gsettings-data-convert.c	Wed Feb  6 15:26:40 2013
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+@@ -90,6 +91,10 @@ get_writable_client (void)
+   GSList *addresses;
+ 
+   addresses = get_writable_source_path ();
++  if (!addresses) {
++    g_printf("No writable gconf locations found\n");
++    exit (1);
++  }
+   engine = gconf_engine_get_local_for_addresses (addresses, NULL);
+   gconf_address_list_free (addresses);
+ 
+@@ -155,7 +160,7 @@ handle_file (const gchar *filename)
+ 
+       schema_path = g_strsplit (groups[i], ":", 2);
+ 
+-      schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
++      schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE);
+       if (schema == NULL)
+         {
+           if (verbose)