diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index a5fc2a9e5f8..b5baede5f75 100755
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,13 +1,17 @@
-# $OpenBSD: Makefile,v 1.7 2011/03/25 07:37:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2011/03/25 08:30:56 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
-COMMENT=	configuration backend system
+COMMENT-main=	configuration backend system
+COMMENT-editor=	editor for the dconf configuration storage system
 
 GNOME_PROJECT=	dconf
 GNOME_VERSION=	0.5.1
 
-REVISION=	4
+PKGNAME-main=	${DISTNAME}
+PKGNAME-editor=	dconf-editor-${GNOME_VERSION}
+
+REVISION-main=	5
 
 SHARED_LIBS+=	dconf 0.0 # 0.0.0
 
@@ -24,18 +28,33 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm c drm expat fontconfig
-WANTLIB += freetype m pixman-1 pthread pthread-stubs xcb xcb-render
-WANTLIB += xcb-shm z atk-1.0 cairo gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 png xml2
+WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += pthread
+
+WANTLIB-editor += ${WANTLIB} ${MODGETTEXT_WANTLIB}
+WANTLIB-editor += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB-editor += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
+WANTLIB-editor += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB-editor += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-editor += pixman-1 png pthread-stubs xcb xcb-render xcb-shm xml2
+WANTLIB-editor += z
+
+MULTI_PACKAGES=	-main
+
+PSEUDO_FLAVORS=	no_editor
+FLAVOR?=
 
 MODULES=	devel/gettext \
 		x11/gnome
 
 BUILD_DEPENDS=	lang/vala
-LIB_DEPENDS=	x11/gtk+2
+
+RUN_DEPENDS-main=	# empty
+LIB_DEPENDS-main=	devel/glib2
+
+RUN_DEPENDS-editor=	${MODGETTEXT_RUN_DEPENDS} \
+			${BASE_PKGPATH},-main
+LIB_DEPENDS-editor=	x11/gtk+2
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -43,6 +62,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--disable-introspection
 
+.if ${FLAVOR:L:Mno_editor}
+CONFIGURE_ARGS +=	--disable-editor
+.else
+MULTI_PACKAGES +=	-editor
+CONFIGURE_ARGS +=	--enable-editor
+.endif
+
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/{bin,client,editor}/Makefile.in \
 		${WRKSRC}/editor/dconf-model.{c,vala}
diff --git a/devel/dconf/pkg/DESCR b/devel/dconf/pkg/DESCR-editor
similarity index 100%
rename from devel/dconf/pkg/DESCR
rename to devel/dconf/pkg/DESCR-editor
diff --git a/devel/dconf/pkg/DESCR-main b/devel/dconf/pkg/DESCR-main
new file mode 100755
index 00000000000..f79ae93798b
--- /dev/null
+++ b/devel/dconf/pkg/DESCR-main
@@ -0,0 +1,3 @@
+dconf is a low-level configuration system. Its main purpose is to
+provide a backend to GSettings on platforms that don't already have
+configuration storage systems.
diff --git a/devel/dconf/pkg/PLIST-editor b/devel/dconf/pkg/PLIST-editor
new file mode 100644
index 00000000000..8f3f1a4c4e5
--- /dev/null
+++ b/devel/dconf/pkg/PLIST-editor
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-editor,v 1.1 2011/03/25 08:30:56 ajacoutot Exp $
+@conflict dconf-<0.5.1p5
+@bin bin/dconf-editor
diff --git a/devel/dconf/pkg/PLIST b/devel/dconf/pkg/PLIST-main
similarity index 91%
rename from devel/dconf/pkg/PLIST
rename to devel/dconf/pkg/PLIST-main
index 903a17e3ae6..2848cd9fd7a 100644
--- a/devel/dconf/pkg/PLIST
+++ b/devel/dconf/pkg/PLIST-main
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/12/19 10:25:05 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2011/03/25 08:30:56 ajacoutot Exp $
 @conflict vala-<0.10
+@pkgpath devel/dconf
 @bin bin/dconf
-@bin bin/dconf-editor
 include/dconf/
 include/dconf/dconf-client.h
 include/dconf/dconf-engine.h
@@ -18,6 +18,8 @@ share/dbus-1/services/
 share/dbus-1/services/ca.desrt.dconf.service
 share/dbus-1/system-services/
 share/dbus-1/system-services/ca.desrt.dconf.service
+share/gtk-doc/
+share/gtk-doc/html/
 share/gtk-doc/html/dconf/
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/annotation-glossary.html