diff --git a/srcpkgs/GConf/GConf-devel.template b/srcpkgs/GConf/GConf-devel.template
index cad2dbf49a..21da1dd7ed 100644
--- a/srcpkgs/GConf/GConf-devel.template
+++ b/srcpkgs/GConf/GConf-devel.template
@@ -1,26 +1,21 @@
 # Template file for 'GConf-devel'.
 #
-depends="glib-devel dbus-devel GConf"
+noarch=yes
+depends="glib-devel dbus-devel GConf>=${version}"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
-	install -d ${DESTDIR}/usr/lib/GConf/2 ${DESTDIR}/usr/{bin,share}
-	install -d ${DESTDIR}/usr/lib/gio/modules
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,sgml,aclocal,gtk-doc} \
-		${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/GConf/2/*.*a ${DESTDIR}/usr/lib/GConf/2
-	mv ${SRCPKGDESTDIR}/usr/lib/gio/modules/*.a \
-		${DESTDIR}/usr/lib/gio/modules
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/sgml usr/share
+	vmove usr/share/aclocal usr/share
+	vmove usr/share/gtk-doc usr/share
 
         # Install gconf-merge-schema
-	install -m755 ${FILESDIR}/gconf-merge-schema.sh \
-		${DESTDIR}/usr/bin/gconf-merge-schema
+	vinstall ${FILESDIR}/gconf-merge-schema.sh \
+		755 usr/bin gconf-merge-schema
 }
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index c35d6704df..56ebbab541 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,16 +1,17 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.5
-distfiles="${GNOME_SITE}/GConf/3.2/GConf-$version.tar.xz"
+revision=2
 build_style=gnu-configure
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
---disable-orbit --enable-gsettings-backend"
-makedepends="pkg-config intltool gobject-introspection gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
-revision=1
+--disable-orbit --enable-gsettings-backend --disable-static"
+makedepends="pkg-config intltool gobject-introspection gtk+3-devel
+ dbus-glib-devel polkit-devel libxml2-devel"
 short_desc="A process-transparent configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://projects.gnome.org/gconf"
 license="GPL-2"
+distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
 long_desc="
  GConf is a process-transparent configuration database API used to
@@ -18,16 +19,15 @@ long_desc="
  support workgroup administration."
 
 conf_files="/etc/gconf/2/path"
-subpackages="$pkgname-devel"
-
+subpackages="${pkgname}-devel"
 
 post_install() {
 	# Create GCONF_SCHEMAS_DIR
-	install -d ${DESTDIR}/usr/share/gconf/schemas
+	vmkdir usr/share/gconf/schemas
 	touch -f ${DESTDIR}/usr/share/gconf/schemas/.empty_on_purpose
 	# Create required sysconfdir dirs.
 	for d in defaults mandatory system; do
-		install -d ${DESTDIR}/etc/gconf/gconf.xml.${d}
+		vmkdir etc/gconf/gconf.xml.${d}
 		touch -f ${DESTDIR}/etc/gconf/gconf.xml.${d}/.empty_on_purpose
 	done
 }