diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index c6f9c4fa661..e5e87954b56 100755
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/05/08 12:20:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/05/09 08:43:45 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,14 +6,11 @@ COMMENT-main=	configuration backend system
 COMMENT-editor=	editor for the dconf configuration storage system
 
 GNOME_PROJECT=	dconf
-GNOME_VERSION=	0.7.4
+GNOME_VERSION=	0.7.5
 
 PKGNAME-main=	${DISTNAME}
 PKGNAME-editor=	dconf-editor-${GNOME_VERSION}
 
-REVISION-main=	1
-REVISION-editor=1
-
 SHARED_LIBS+=	dconf        0.0 # 0.0.0
 SHARED_LIBS+=	dconf-dbus-1 0.0 # 0.0.0
 
@@ -48,7 +45,8 @@ PSEUDO_FLAVORS=	no_editor
 FLAVOR?=
 
 MODULES=	devel/gettext \
-		x11/gnome
+		x11/gnome \
+		devel/dconf
 
 BUILD_DEPENDS=	lang/vala>=0.12.0
 
@@ -57,7 +55,7 @@ LIB_DEPENDS-main=	devel/glib2 \
 			x11/dbus
 
 RUN_DEPENDS-editor=	${MODGETTEXT_RUN_DEPENDS} \
-			${BASE_PKGPATH},-main \
+			${MODDCONF_RUN_DEPENDS} \
 			devel/desktop-file-utils
 LIB_DEPENDS-editor=	x11/gtk+3
 
@@ -77,7 +75,6 @@ CONFIGURE_ARGS +=	--enable-editor
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in \
-		${WRKSRC}/editor/dconf-model.vala \
 		${WRKSRC}/dbus-1/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/dconf/dconf.port.mk b/devel/dconf/dconf.port.mk
index a8fc35304df..1042f32eaca 100644
--- a/devel/dconf/dconf.port.mk
+++ b/devel/dconf/dconf.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: dconf.port.mk,v 1.1 2011/03/25 08:59:48 ajacoutot Exp $
+# $OpenBSD: dconf.port.mk,v 1.2 2011/05/09 08:43:45 ajacoutot Exp $
 
 # This module is used by ports installing gsettings schemas under
 #     PREFIX/share/glib-2.0/schemas/
@@ -7,7 +7,7 @@
 # @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 # @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 
-# use the "no_editor" FLAVOR to prevent a cyclic dependency with x11/gtk+3
+# use the "no_editor" FLAVOR to prevent a cyclic dependency
 MODDCONF_BUILD_DEPENDS=	devel/glib2
 MODDCONF_RUN_DEPENDS=	devel/glib2 \
 			devel/dconf,no_editor
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index efc665d7278..ded6e1cd85e 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,5 +1,5 @@
-MD5 (dconf-0.7.4.tar.bz2) = INdBCf9yrhb8yj9a3z1ohQ==
-RMD160 (dconf-0.7.4.tar.bz2) = gPFjP8JQ5lARgSxYgHJdhIaHmkY=
-SHA1 (dconf-0.7.4.tar.bz2) = HmAaW+na2NEZ2pk5nDWNesxvHq4=
-SHA256 (dconf-0.7.4.tar.bz2) = KZ152vCyFMaS59V4jXvadtd4wXSOo3wzJWxPphQ7Is0=
-SIZE (dconf-0.7.4.tar.bz2) = 191059
+MD5 (dconf-0.7.5.tar.bz2) = 14T4r8oERz0ZSnIEdZXCjg==
+RMD160 (dconf-0.7.5.tar.bz2) = qKQ1VSEPzjO85yBSHj7wXy3T3WQ=
+SHA1 (dconf-0.7.5.tar.bz2) = 9A3sWNb/PLyOdT3kjy/g8BSmGW0=
+SHA256 (dconf-0.7.5.tar.bz2) = 4hA+ggd0SQN5Dp+sZCf6OUu0haDH9ODQOw+0MmjDTzM=
+SIZE (dconf-0.7.5.tar.bz2) = 193355
diff --git a/devel/dconf/patches/patch-bin_Makefile_in b/devel/dconf/patches/patch-bin_Makefile_in
index c2d58a00376..9874d92ecc0 100644
--- a/devel/dconf/patches/patch-bin_Makefile_in
+++ b/devel/dconf/patches/patch-bin_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bin_Makefile_in,v 1.3 2011/05/06 14:22:27 ajacoutot Exp $
---- bin/Makefile.in.orig	Fri May  6 14:58:32 2011
-+++ bin/Makefile.in	Fri May  6 15:44:35 2011
+$OpenBSD: patch-bin_Makefile_in,v 1.4 2011/05/09 08:43:45 ajacoutot Exp $
+--- bin/Makefile.in.orig	Mon May  9 10:10:12 2011
++++ bin/Makefile.in	Mon May  9 10:28:38 2011
 @@ -51,7 +51,7 @@ am_dconf_OBJECTS = dconf.$(OBJEXT) dconf-update.$(OBJE
  	gvdb-builder.$(OBJEXT)
  dconf_OBJECTS = $(am_dconf_OBJECTS)
@@ -10,7 +10,7 @@ $OpenBSD: patch-bin_Makefile_in,v 1.3 2011/05/06 14:22:27 ajacoutot Exp $
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -218,7 +218,7 @@ top_srcdir = @top_srcdir@
+@@ -221,7 +221,7 @@ top_srcdir = @top_srcdir@
  AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings
  INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/engine -I$(top_srcdir)/client -I$(top_srcdir)/gvdb $(gio_CFLAGS)
  dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
diff --git a/devel/dconf/patches/patch-client_Makefile_in b/devel/dconf/patches/patch-client_Makefile_in
index 33f674a0f67..3ce9935ff90 100644
--- a/devel/dconf/patches/patch-client_Makefile_in
+++ b/devel/dconf/patches/patch-client_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-client_Makefile_in,v 1.4 2011/05/07 14:45:22 ajacoutot Exp $
---- client/Makefile.in.orig	Fri May  6 14:58:32 2011
-+++ client/Makefile.in	Sat May  7 16:44:34 2011
+$OpenBSD: patch-client_Makefile_in,v 1.5 2011/05/09 08:43:45 ajacoutot Exp $
+--- client/Makefile.in.orig	Mon May  9 10:10:12 2011
++++ client/Makefile.in	Mon May  9 10:28:38 2011
 @@ -34,7 +34,7 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -10,7 +10,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.4 2011/05/07 14:45:22 ajacoutot Exp $
  subdir = client
  DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
-@@ -225,13 +225,13 @@ top_srcdir = @top_srcdir@
+@@ -228,13 +228,13 @@ top_srcdir = @top_srcdir@
  AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -D__dconf_h__ -fPIC -DPIC
  INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
  shlibdir = $(libdir)
@@ -26,7 +26,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.4 2011/05/07 14:45:22 ajacoutot Exp $
  libdconf_so_0_0_0_SOURCES = \
  	../common/dconf-shmdir.c	\
  	../common/dconf-paths.c		\
-@@ -319,8 +319,8 @@ uninstall-shlibPROGRAMS:
+@@ -322,8 +322,8 @@ uninstall-shlibPROGRAMS:
  
  clean-shlibPROGRAMS:
  	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
@@ -37,7 +37,7 @@ $OpenBSD: patch-client_Makefile_in,v 1.4 2011/05/07 14:45:22 ajacoutot Exp $
  	$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
  
  mostlyclean-compile:
-@@ -692,17 +692,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
+@@ -695,17 +695,12 @@ uninstall-am: uninstall-dconfincludeHEADERS uninstall-
  	uninstall-vapiDATA
  
  
diff --git a/devel/dconf/patches/patch-dbus-1_Makefile_in b/devel/dconf/patches/patch-dbus-1_Makefile_in
index 2c5bfb33204..be18c3bb0b7 100644
--- a/devel/dconf/patches/patch-dbus-1_Makefile_in
+++ b/devel/dconf/patches/patch-dbus-1_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dbus-1_Makefile_in,v 1.2 2011/04/13 17:05:11 ajacoutot Exp $
---- dbus-1/Makefile.in.orig	Tue Mar 22 17:09:56 2011
-+++ dbus-1/Makefile.in	Tue Apr  5 15:02:28 2011
+$OpenBSD: patch-dbus-1_Makefile_in,v 1.3 2011/05/09 08:43:45 ajacoutot Exp $
+--- dbus-1/Makefile.in.orig	Mon May  9 10:10:12 2011
++++ dbus-1/Makefile.in	Mon May  9 10:28:38 2011
 @@ -34,7 +34,7 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -10,7 +10,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.2 2011/04/13 17:05:11 ajacoutot Exp $
  subdir = dbus-1
  DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
-@@ -227,14 +227,14 @@ pkgconfigdir = $(libdir)/pkgconfig
+@@ -230,14 +230,14 @@ pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = dconf-dbus-1.pc
  shlibdir = $(libdir)
  libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
@@ -27,7 +27,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.2 2011/04/13 17:05:11 ajacoutot Exp $
  CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
  all: all-am
  
-@@ -309,8 +309,8 @@ uninstall-shlibPROGRAMS:
+@@ -312,8 +312,8 @@ uninstall-shlibPROGRAMS:
  
  clean-shlibPROGRAMS:
  	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
@@ -38,7 +38,7 @@ $OpenBSD: patch-dbus-1_Makefile_in,v 1.2 2011/04/13 17:05:11 ajacoutot Exp $
  	$(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
  
  mostlyclean-compile:
-@@ -633,14 +633,6 @@ uninstall-am: uninstall-dconf_dbus_1includeHEADERS \
+@@ -636,14 +636,6 @@ uninstall-am: uninstall-dconf_dbus_1includeHEADERS \
  	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
  	uninstall-am uninstall-dconf_dbus_1includeHEADERS \
  	uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
diff --git a/devel/dconf/patches/patch-editor_Makefile_in b/devel/dconf/patches/patch-editor_Makefile_in
index 68db6f6a969..336945a7ede 100644
--- a/devel/dconf/patches/patch-editor_Makefile_in
+++ b/devel/dconf/patches/patch-editor_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-editor_Makefile_in,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
---- editor/Makefile.in.orig	Tue Mar 22 17:09:56 2011
-+++ editor/Makefile.in	Tue Apr  5 14:40:33 2011
-@@ -53,7 +53,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
+$OpenBSD: patch-editor_Makefile_in,v 1.3 2011/05/09 08:43:45 ajacoutot Exp $
+--- editor/Makefile.in.orig	Mon May  9 10:10:12 2011
++++ editor/Makefile.in	Mon May  9 10:28:38 2011
+@@ -54,7 +54,7 @@ am_dconf_editor_OBJECTS = dconf-editor.$(OBJEXT) dconf
  	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
  dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
  am__DEPENDENCIES_1 =
@@ -10,7 +10,7 @@ $OpenBSD: patch-editor_Makefile_in,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -218,7 +218,7 @@ top_builddir = @top_builddir@
+@@ -222,7 +222,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
  AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
diff --git a/devel/dconf/patches/patch-editor_dconf-model_vala b/devel/dconf/patches/patch-editor_dconf-model_vala
deleted file mode 100644
index 7dcfd9947f5..00000000000
--- a/devel/dconf/patches/patch-editor_dconf-model_vala
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-editor_dconf-model_vala,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
---- editor/dconf-model.vala.orig	Tue Mar 22 16:35:32 2011
-+++ editor/dconf-model.vala	Tue Apr  5 14:38:47 2011
-@@ -564,7 +564,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
-         schemas = new SchemaList();
-         try
-         {
--            schemas.load_directory("/usr/share/glib-2.0/schemas");
-+            schemas.load_directory("${LOCALBASE}/share/glib-2.0/schemas");
-         } catch (Error e) {
-             warning("Failed to parse schemas: %s", e.message);
-         }
diff --git a/devel/dconf/patches/patch-editor_dconf-schema_vala b/devel/dconf/patches/patch-editor_dconf-schema_vala
deleted file mode 100644
index 784a29ba0b1..00000000000
--- a/devel/dconf/patches/patch-editor_dconf-schema_vala
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-editor_dconf-schema_vala,v 1.2 2011/05/06 14:22:27 ajacoutot Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646220
-
---- editor/dconf-schema.vala.orig	Wed May  4 15:59:30 2011
-+++ editor/dconf-schema.vala	Fri May  6 16:01:37 2011
-@@ -52,9 +52,9 @@ public class SchemaKey
-                 }
-             }
-             else if (child->name == "summary")
--                summary = child->children->content;
-+                summary = child->children == null ? "" : child->children->content;
-             else if (child->name == "description")
--                description = child->children->content;
-+                description = child->children == null ? "" : child->children->content;
-             else if (child->name == "range")
-                 range = new SchemaValueRange.from_xml(type, child);
-             else if (child->name == "choices")
diff --git a/devel/dconf/patches/patch-engine_dconf-engine_c b/devel/dconf/patches/patch-engine_dconf-engine_c
deleted file mode 100644
index 6acdca3dda1..00000000000
--- a/devel/dconf/patches/patch-engine_dconf-engine_c
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-engine_dconf-engine_c,v 1.4 2011/05/08 12:20:37 ajacoutot Exp $
-
-From c80896f5644ec0a07822047dd7e899da63b42e89 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Sun, 08 May 2011 12:08:38 +0000
-Subject: Fix crash when user database is not present
-
---- engine/dconf-engine.c.orig	Fri May  6 14:45:33 2011
-+++ engine/dconf-engine.c	Sun May  8 14:15:42 2011
-@@ -452,7 +452,11 @@ dconf_engine_read_internal (DConfEngine  *engine,
-       break;
- 
-   while (i < limit && value == NULL)
--    value = gvdb_table_get_value (engine->gvdbs[i++], key);
-+    {
-+      if (engine->gvdbs[i] != NULL)
-+        value = gvdb_table_get_value (engine->gvdbs[i], key);
-+      i++;
-+    }
- 
-   g_static_mutex_unlock (&engine->lock);
- 
diff --git a/devel/dconf/pkg/PLIST-editor b/devel/dconf/pkg/PLIST-editor
index 610983e28a7..3bccf1a824b 100644
--- a/devel/dconf/pkg/PLIST-editor
+++ b/devel/dconf/pkg/PLIST-editor
@@ -1,8 +1,11 @@
-@comment $OpenBSD: PLIST-editor,v 1.2 2011/04/05 18:45:05 ajacoutot Exp $
+@comment $OpenBSD: PLIST-editor,v 1.3 2011/05/09 08:43:45 ajacoutot Exp $
 @conflict dconf-<0.5.1p5
 @bin bin/dconf-editor
 share/applications/dconf-editor.desktop
 share/dconf-editor/
 share/dconf-editor/dconf-editor.ui
+share/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
+@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
+@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database