diff --git a/templates/GConf-devel b/templates/GConf-devel
new file mode 120000
index 00000000000..cf3c511e781
--- /dev/null
+++ b/templates/GConf-devel
@@ -0,0 +1 @@
+GConf
\ No newline at end of file
diff --git a/templates/GConf/depends b/templates/GConf/depends
new file mode 100644
index 00000000000..0812aac72df
--- /dev/null
+++ b/templates/GConf/depends
@@ -0,0 +1,2 @@
+abi_depends=2.26.1
+api_depends=${abi_depends}
diff --git a/templates/GConf/devel.template b/templates/GConf/devel.template
new file mode 100644
index 00000000000..0a99a3c498c
--- /dev/null
+++ b/templates/GConf/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'GConf-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run GConf
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}//usr/lib/GConf/2/*.*a ${DESTDIR}/usr/lib/GConf/2
+}
diff --git a/templates/GConf/template b/templates/GConf/template
index ddf09868822..79967dada17 100644
--- a/templates/GConf/template
+++ b/templates/GConf/template
@@ -1,5 +1,6 @@
 # Template file for 'GConf'
 pkgname=GConf
+sourcepkg=$pkgname
 version=2.26.1
 distfiles="${GNOME_SITE}/GConf/2.26/GConf-$version.tar.bz2"
 build_style=gnu_configure
@@ -12,9 +13,15 @@ long_desc="
  store user preferences. It has pluggable backends and features to
  support workgroup administration."
 
+conf_files="/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf
+ /etc/gconf/2/path"
+
+subpackages="devel"
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency full glibc
 Add_dependency full gtk+
+Add_dependency full dbus-glib
 Add_dependency full ORBit2
 Add_dependency full PolicyKit
+Add_dependency full libxml2