diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 203e31376d..2d3d71e492 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
 version=0.1.31
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
@@ -41,7 +41,7 @@ colord_package() {
 	system_accounts="colord"
 	colord_homedir="/var/lib/colord"
 	make_dirs="/var/lib/colord 0755 colord colord"
-	depends="shared-color-profiles"
+	depends="shared-color-profiles shadow"
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index c80d8506b9..c5edcda205 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -11,12 +11,11 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 checksum=e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415
 
-makedepends="pkg-config perl glib-devel libXcursor-devel libXext-devel
- libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
+makedepends="pkg-config perl shared-mime-info glib-devel libXcursor-devel
+ libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
  libXcomposite-devel libXdamage-devel fontconfig-devel
  gdk-pixbuf-devel>=2.26.1_2 cairo-devel pango-devel>=1.28.0
- atk-devel>=1.32.0 gobject-introspection cups-devel
- shared-mime-info dbus-x11"
+ atk-devel>=1.32.0 gobject-introspection cups-devel dbus-x11"
 
 gtk+-devel_package() {
 	depends="glib-devel atk-devel cairo-devel gdk-pixbuf-devel pango-devel gtk+>=${version}"
@@ -45,7 +44,7 @@ gtk-update-icon-cache_package() {
 	depends="gdk-pixbuf>=2.26.1_2" # libpng-1.5
 	pkg_install() {
 		vmove usr/bin/gtk-update-icon-cache
-		vinstall docs/reference/gtk/gtk-update-icon-cache.1 644 usr/share/man/man1
+		vinstall ${wrksrc}/docs/reference/gtk/gtk-update-icon-cache.1 644 usr/share/man/man1
 	}
 }
 
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 70afdd6ffb..d876612d3c 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
 version=3.8.0
-revision=2
+revision=3
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
 configure_args="--enable-cups --disable-schemas-compile
@@ -55,6 +55,7 @@ gtk+3_package() {
 	conf_files="/etc/gtk-3.0/im-multipress.conf"
 	depends="gtk-update-icon-cache shared-mime-info glib>=2.36 atk>=2.8.0 dbus-x11"
 	pkg_install() {
+		vmove etc
 		vmove usr
 	}
 }
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index 4403020d6b..6971757d2e 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -54,7 +54,6 @@ kmod_package() {
 	provides="module-init-tools-3.17"
 	replaces="module-init-tools>=0"
 	pkg_install() {
-		vmove etc
 		vmove usr
 	}
 }
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 285facf9dd..22c2703952 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-pam --disable-python-bindings
  --with-securedir=/usr/lib/security"
-makedepends="pam-devel"
+makedepends="cracklib-devel pam-devel"
 short_desc="Library for password quality checking and generating random passwords"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://fedorahosted.org/libpwquality/"
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index e2a2e0d702..f90ed5fd97 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -57,11 +57,11 @@ device-mapper_package() {
 		vmove "usr/lib/libdevmapper*.so*"
 		vmove "usr/lib/liblvm2cmd.so*"
 		vmove "usr/share/man/man8/dm*"
-		vmove usr/lib/device-mapper usr/lib
+		vmove usr/lib/device-mapper
 		for f in 10-dm 13-dm-disk 95-dm-notify; do
 			vmove usr/lib/udev/rules.d/${f}.rules
-		one
-		install -d ${PKGDESTDIR}usr/lib/systemd/system/sockets.target.wants
+		done
+		install -d ${PKGDESTDIR}/usr/lib/systemd/system/sockets.target.wants
 		vinstall ${FILESDIR}/dmeventd.service 644 usr/lib/systemd/system
 		vinstall ${FILESDIR}/dmeventd.socket 644 usr/lib/systemd/system
 		ln -sf /usr/lib/systemd/system/dmeventd.socket \
diff --git a/srcpkgs/nettle/nettle-devel.template b/srcpkgs/nettle/nettle-devel.template
deleted file mode 100644
index f24be8a4ee..0000000000
--- a/srcpkgs/nettle/nettle-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nettle-devel'.
-#
-noarch=yes
-depends="gmp-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/info usr/share
-}
diff --git a/srcpkgs/nettle/nettle-tools.template b/srcpkgs/nettle/nettle-tools.template
deleted file mode 100644
index e6d91be780..0000000000
--- a/srcpkgs/nettle/nettle-tools.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'nettle-tools'.
-#
-short_desc="${short_desc} (bundled tools)"
-long_desc="${long_desc}
-
- This package contains the tools that come with gnutls."
-
-do_install() {
-	vmove usr/bin usr
-	#vmove usr/share/man/man1 usr/share/man
-}
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index 9966955c3c..db89343a8f 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,10 +1,9 @@
 # Template build file for 'nettle'.
 pkgname=nettle
 version=2.5
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="${pkgname}-devel ${pkgname}-tools"
-configure_args="--enable-shared --disable-static"
+configure_args="--enable-shared"
 short_desc="A low-level cryptographic library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.lysator.liu.se/~nisse/nettle/"
@@ -16,6 +15,27 @@ long_desc="
  less any context: In crypto toolkits for object-oriented languages (C++,
  Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space."
 
-post_install() {
-	rm -f ${DESTDIR}/usr/lib/*.a
+nettle-devel_package() {
+	depends="gmp-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/info
+	}
+}
+
+nettle-tools_package() {
+	short_desc="${short_desc} (bundled tools)"
+	pkg_install() {
+		vmove usr/bin
+		#vmove usr/share/man/man1
+	}
+}
+
+nettle_package() {
+	pkg_install() {
+		vmove usr
+	}
 }
diff --git a/srcpkgs/nspr/nspr-devel.template b/srcpkgs/nspr/nspr-devel.template
deleted file mode 100644
index 057cba186a..0000000000
--- a/srcpkgs/nspr/nspr-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nspr-devel'.
-#
-noarch=yes
-depends="nspr-${version}_${revision}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/bin usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index d0430c67ee..54a15a5f40 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,15 +1,14 @@
 # Template file for 'nspr'
 pkgname=nspr
 version=4.9.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_script="./mozilla/nsprpub/configure"
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_for64="--enable-64bit"
 fi
 configure_args="--libdir=/usr/lib --includedir=/usr/include/nspr
---enable-optimize --disable-debug --with-pthreads ${_for64}"
-subpackages="$pkgname-devel"
+ --enable-optimize --disable-debug --with-pthreads ${_for64}"
 short_desc="NetScape Portable Runtime"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/projects/nspr/"
@@ -43,3 +42,19 @@ post_install() {
 	# Remove static libs.
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
+
+nspr-devel_package() {
+	depends="nspr-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/bin
+		vmove usr/lib/pkgconfig
+	}
+}
+
+nspr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/p11-kit/p11-kit-devel.template b/srcpkgs/p11-kit/p11-kit-devel.template
deleted file mode 100644
index fca4707339..0000000000
--- a/srcpkgs/p11-kit/p11-kit-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'p11-kit-devel'.
-#
-noarch=yes
-depends="glibc-devel p11-kit>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 401ede111e..b3917c50d7 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,7 +1,7 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
 version=0.16.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-system-anchors --with-system-certificates=/etc/ssl/certs"
 short_desc="Provides a way to load and enumerate PKCS#11 modules"
@@ -17,10 +17,27 @@ long_desc="
  Also solves problems with coordinating the use of PKCS#11 by different
  components or libraries living in the same process."
 
-conf_files="/etc/pkcs11/pkcs11.conf"
-subpackages="$pkgname-devel"
-makedepends="pkg-config libtasn1-devel"
+hostmakedepends="pkg-config"
+makedepends="libtasn1-devel"
 
 post_install() {
-	mv ${DESTDIR}/${conf_files}.example ${DESTDIR}/${conf_files}
+	mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf
+}
+
+p11-kit-devel_package() {
+	depends="p11-kit>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
+
+p11-kit_package() {
+	conf_files="/etc/pkcs11/pkcs11.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
 }
diff --git a/srcpkgs/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template
index b58f0a2ae5..7f5ac46a01 100644
--- a/srcpkgs/perl-XML-NamespaceSupport/template
+++ b/srcpkgs/perl-XML-NamespaceSupport/template
@@ -3,13 +3,13 @@ pkgname=perl-XML-NamespaceSupport
 version=1.11
 revision=1
 wrksrc="XML-NamespaceSupport-$version"
-distfiles="${CPAN_SITE}/XML/XML-NamespaceSupport-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl"
+makedepends="perl"
 short_desc="Perl module to the SAX2 NamespaceSupport class"
 homepage="http://search.cpan.org/~perigrin/XML-NamespaceSupport-1.11/"
 license="GPL+ or Artistic"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${CPAN_SITE}/XML/XML-NamespaceSupport-$version.tar.gz"
 checksum=6d8151f0a3f102313d76b64bfd1c2d9ed46bfe63a16f038e7d860fda287b74ea
 long_desc="
  This module offers a simple to process namespaced XML names (unames)
@@ -17,4 +17,10 @@ long_desc="
  maintain a prefix to namespace URI map, and provides a number of
  basic checks."
 
-noarch=yes
+perl-XML-NamespaceSupport_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/perl-XML-SAX-Base/template b/srcpkgs/perl-XML-SAX-Base/template
index 73ac4b0e53..6c0efcebf9 100644
--- a/srcpkgs/perl-XML-SAX-Base/template
+++ b/srcpkgs/perl-XML-SAX-Base/template
@@ -1,15 +1,15 @@
 # Template build file for 'perl-XML-SAX'.
 pkgname=perl-XML-SAX-Base
 version=1.08
-wrksrc="${pkgname#perl-}-$version"
-distfiles="${CPAN_SITE}/XML/${pkgname#perl-}-${version}.tar.gz"
-build_style=perl-module
-fulldepends="perl"
 revision=1
+wrksrc="${pkgname#perl-}-$version"
+build_style=perl-module
+makedepends="perl"
 short_desc="Perl Base class SAX Drivers and Filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX-Base"
 license="GPL-2"
+distfiles="${CPAN_SITE}/XML/${pkgname#perl-}-${version}.tar.gz"
 checksum=666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e
 long_desc="
  This module has a very simple task - to be a base class for PerlSAX drivers
@@ -17,4 +17,10 @@ long_desc="
  unchanged. It can be useful to use this module as a base class so you don't
  have to, for example, implement the characters() callback."
 
-noarch=yes
+perl-XML-SAX-Base_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template
index 7a14e623b9..f91ac1fef1 100644
--- a/srcpkgs/perl-XML-SAX/template
+++ b/srcpkgs/perl-XML-SAX/template
@@ -3,17 +3,23 @@ pkgname=perl-XML-SAX
 version=0.99
 revision=1
 wrksrc="XML-SAX-$version"
-distfiles="${CPAN_SITE}/XML/XML-SAX-$version.tar.gz"
 build_style=perl-module
-fulldepends="perl perl-XML-NamespaceSupport perl-XML-SAX-Base"
+makedepends="perl perl-XML-NamespaceSupport perl-XML-SAX-Base"
 short_desc="Perl interface to the SAX2 XML Parser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://search.cpan.org/dist/XML-SAX"
 license="GPL-2"
+distfiles="${CPAN_SITE}/XML/XML-SAX-$version.tar.gz"
 checksum=32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6f5ad84
 long_desc="
  This module provides ways to parse XML documents. It is built on top of
  XML::SAX::Expat, which is a lower level interface to James Clark's
  expat library."
 
-noarch=yes
+perl-XML-SAX_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/polkit/polkit-devel.template b/srcpkgs/polkit/polkit-devel.template
deleted file mode 100644
index 54971bdc19..0000000000
--- a/srcpkgs/polkit/polkit-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'polkit-devel'.
-#
-noarch=yes
-depends="glib-devel polkit>=${version}"
-replaces="PolicyKit-devel>=0"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gir-1.0 usr/share
-}
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 2ab46ef15b..06a6a45cf3 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.110
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-systemd=yes --with-authfw=pam
  --with-systemdsystemunitdir=/usr/lib/systemd/system"
@@ -12,12 +12,31 @@ license="GPL-2"
 distfiles="http://www.freedesktop.org/software/polkit/releases/polkit-${version}.tar.gz"
 checksum=8e5c5044bb968643b7fa379f287fb10582615df760ad2f1cb84be6e19fafe6e8
 
-system_accounts="polkitd"
-subpackages="polkit-devel"
 makedepends="pkg-config intltool libxslt docbook-xsl glib-devel
- expat-devel pam-devel systemd-devel gobject-introspection js-devel"
+ expat-devel pam-devel systemd-devel gobject-introspection js-devel
+ shadow"
 
 post_install() {
 	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
 	vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf
 }
+
+polkit-devel_package() {
+	depends="libglib-devel polkit>=${version}"
+	replaces="PolicyKit-devel>=0"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+	}
+}
+
+polkit_package() {
+	system_accounts="polkitd"
+	depends="shadow"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/popt/popt-devel.template b/srcpkgs/popt/popt-devel.template
deleted file mode 100644
index dea52c8482..0000000000
--- a/srcpkgs/popt/popt-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'popt-devel'.
-#
-depends="popt>=${version}"
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man3 usr/share/man
-	rm -rf ${SRCPKGDESTDIR}/usr/share/man
-}
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index aeb460c0af..e824492e6e 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -1,9 +1,8 @@
 # Template file for 'popt'
 pkgname=popt
 version=1.16
-revision=3
+revision=4
 build_style=gnu-configure
-subpackages="$pkgname-devel"
 configure_args="--disable-static --disable-rpath"
 short_desc="Command line option parsing library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,3 +10,19 @@ homepage="http://rpm5.org"
 license="MIT"
 distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz"
 checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
+
+popt-devel_package() {
+	depends="popt>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/man/man3
+	}
+}
+
+popt_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pycairo/pycairo-devel.template b/srcpkgs/pycairo/pycairo-devel.template
deleted file mode 100644
index d748c543b9..0000000000
--- a/srcpkgs/pycairo/pycairo-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'pycairo-devel'.
-#
-depends="pycairo"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template
index 7842831093..bd4001b1fa 100644
--- a/srcpkgs/pycairo/template
+++ b/srcpkgs/pycairo/template
@@ -1,19 +1,30 @@
 # Template file for 'pycairo'
 pkgname=pycairo
 version=1.8.8
-revision=7
-distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
+revision=8
 build_style=gnu-configure
-depends="python"
-makedepends="pkg-config cairo-devel glibc-devel python-devel"
+hostmakedepends="pkg-config"
+makedepends="cairo-devel python-devel"
 short_desc="Python bindings for the cairo graphics library"
 homepage="http://cairographics.org/pycairo/"
 license="LGPL-3"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 checksum=2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
-long_desc="
- Pycairo is a set of Python bindings for the cairo graphics library."
 
-pycompile_module="cairo"
-subpackages="$pkgname-devel"
+pycairo-devel_package() {
+	depends="pycairo>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
 
+pycairo_package() {
+	depends="python"
+	pycompile_module="cairo"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pygobject/pygobject-devel.template b/srcpkgs/pygobject/pygobject-devel.template
deleted file mode 100644
index fee7e57023..0000000000
--- a/srcpkgs/pygobject/pygobject-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'pygobject-devel'.
-#
-depends="libffi-devel glib-devel libgirepository-devel
- pycairo-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template
index a8f98906e7..e683add206 100644
--- a/srcpkgs/pygobject/template
+++ b/srcpkgs/pygobject/template
@@ -1,16 +1,31 @@
 # Template file for 'pygobject'
 pkgname=pygobject
 version=3.8.0
-revision=1
+revision=2
 build_style=gnu-configure
-pycompile_module="gi pygtkcompat"
-subpackages="$pkgname-devel"
-depends="python pycairo"
 hostmakedepends="pkg-config gobject-introspection>=1.36"
-makedepends="pkg-config pycairo-devel glib-devel libffi-devel python-devel"
+makedepends="pycairo-devel libglib-devel python-devel"
 short_desc="Python bindings for GObject"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9c57f581ae35587108c978cb116eeb7ec186b50c95b145f62033589ee248b32d
+
+pygobject-devel_package() {
+	depends="libffi-devel libglib-devel libgirepository-devel
+		pycairo-devel ${sourcepkg}-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+pygobject_package() {
+	pycompile_module="gi pygtkcompat"
+	depends="python pycairo"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pygobject2/pygobject2-devel.template b/srcpkgs/pygobject2/pygobject2-devel.template
deleted file mode 100644
index 36f35ca20f..0000000000
--- a/srcpkgs/pygobject2/pygobject2-devel.template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'pygobject-devel'.
-#
-depends="libffi-devel glib-devel libgirepository-devel pycairo-devel pygobject2"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-pycompile_module="usr/share/pygobject/2.0/codegen"
-replaces="pygobject-devel<3.0.0"
-
-
-do_install()
-{
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template
index 5d121b263a..e54d91fb11 100644
--- a/srcpkgs/pygobject2/template
+++ b/srcpkgs/pygobject2/template
@@ -1,24 +1,39 @@
 # Template file for 'pygobject2'
 pkgname=pygobject2
 version=2.28.6
-revision=4
+revision=5
 wrksrc=${pkgname%2}-${version}
-distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-introspection"
-depends="cairo libgirepository python pycairo"
-makedepends="pkg-config glib-devel cairo-devel libffi-devel python-devel pycairo-devel"
+hostmakedepends="pkg-config"
+makedepends="libffi-devel libglib-devel cairo-devel python-devel pycairo-devel"
 short_desc="Python bindings for GObject (GLib 2.x)"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
 checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
 long_desc="
  Pygobject is a set of Python bindings for the GLib's GObject library,
  version 2."
 
-pycompile_module="glib gobject gtk-2.0 pygtk"
-replaces="pygobject<3.0.0"
-subpackages="$pkgname-devel"
-
+pygobject2-devel_package() {
+	depends="libffi-devel libglib-devel libgirepository-devel pycairo-devel pygobject2>=${version}"
+	short_desc+=" -- development files"
+	pycompile_module="usr/share/pygobject/2.0/codegen"
+	replaces="pygobject-devel<3.0.0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}
 
+pygobject2_package() {
+	depends="cairo libgirepository python pycairo"
+	pycompile_module="glib gobject gtk-2.0 pygtk"
+	replaces="pygobject<3.0.0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pygtk/pygtk-devel.template b/srcpkgs/pygtk/pygtk-devel.template
deleted file mode 100644
index 1daa41d21d..0000000000
--- a/srcpkgs/pygtk/pygtk-devel.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'pygtk-devel'.
-#
-depends="python-devel gtk+-devel pygobject2-devel pycairo-devel pygtk"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-pycompile_module="demos ."
-
-
-do_install()
-{
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/bin usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/lib/pygtk usr/lib
-}
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 11be4f6be7..5025e13207 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -1,10 +1,8 @@
 # Template file for 'pygtk'
 pkgname=pygtk
 version=2.24.0
-revision=5
-distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
+revision=6
 build_style=gnu-configure
-depends="python pygobject2 pycairo"
 # XXX: missing python-numpy build dep
 hostmakedepends="pkg-config"
 makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel"
@@ -12,13 +10,32 @@ short_desc="Python bindings for the GTK+ toolkit"
 homepage="http://www.pygtk.org"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
 checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
 long_desc="
  Pygtk is a set of Python bindings for the GTK+ toolkit."
 
-pycompile_module="gtk-2.0/gtk"
-subpackages="pygtk-devel"
-
 post_install() {
 	vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
 }
+
+pygtk-devel_package() {
+	depends="python-devel gtk+-devel pygobject2-devel pycairo-devel pygtk>=${version}"
+	short_desc+=" -- development files"
+	pycompile_module="demos"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove usr/bin
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/pygtk
+	}
+}
+
+pygtk_package() {
+	depends="python pygobject2 pycairo"
+	pycompile_module="gtk-2.0/gtk"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index f57b2ca9f3..c723c01d97 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -6,7 +6,6 @@ build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static
  --with-libpam --without-selinux --with-acl --with-attr"
-depends="pam"
 makedepends="acl-devel pam-devel"
 short_desc="Shadow password file utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,23 +14,6 @@ homepage="http://pkg-shadow.alioth.debian.org"
 distfiles="$homepage/releases/$pkgname-$version.tar.bz2"
 checksum=aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb
 
-conf_files="
-/etc/pam.d/usermod
-/etc/pam.d/userdel
-/etc/pam.d/useradd
-/etc/pam.d/passwd
-/etc/pam.d/newusers
-/etc/pam.d/groupmod
-/etc/pam.d/groupmems
-/etc/pam.d/groupdel
-/etc/pam.d/groupadd
-/etc/pam.d/chpasswd
-/etc/pam.d/chgpasswd
-/etc/pam.d/chage
-/etc/pam.d/other
-/etc/defaults/useradd
-/etc/login.defs"
-
 # Build PIE binaries by default.
 CFLAGS="-fPIE"
 LDFLAGS="-pie"
@@ -95,3 +77,27 @@ post_install() {
 
 	vinstall $FILESDIR/LICENSE 644 usr/share/licenses/shadow
 }
+
+shadow_package() {
+	conf_files="
+		/etc/pam.d/usermod
+		/etc/pam.d/userdel
+		/etc/pam.d/useradd
+		/etc/pam.d/passwd
+		/etc/pam.d/newusers
+		/etc/pam.d/groupmod
+		/etc/pam.d/groupmems
+		/etc/pam.d/groupdel
+		/etc/pam.d/groupadd
+		/etc/pam.d/chpasswd
+		/etc/pam.d/chgpasswd
+		/etc/pam.d/chage
+		/etc/pam.d/other
+		/etc/defaults/useradd
+		/etc/login.defs"
+	depends="pam"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/systemd/libgudev-devel.template b/srcpkgs/systemd/libgudev-devel.template
deleted file mode 100644
index 5ff4d47a7a..0000000000
--- a/srcpkgs/systemd/libgudev-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libgudev-devel'.
-#
-depends="glib-devel libudev-devel libgudev"
-short_desc="GObject-based wrapper library for libudev - development files"
-
-do_install() {
-	vmove usr/include/gudev-1.0 usr/include
-	vmove "usr/lib/pkgconfig/gudev*" usr/lib/pkgconfig
-	vmove usr/share/gir-1.0 usr/share
-}
diff --git a/srcpkgs/systemd/libgudev.template b/srcpkgs/systemd/libgudev.template
deleted file mode 100644
index d775fc2508..0000000000
--- a/srcpkgs/systemd/libgudev.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'libgudev'.
-#
-short_desc="GObject-based wrapper library for libudev"
-depends="libudev>=${version}"
-
-do_install() {
-	vmove "usr/lib/libgudev*.so*" usr/lib
-	vmove usr/lib/girepository-1.0 usr/lib
-}
diff --git a/srcpkgs/systemd/systemd-python.template b/srcpkgs/systemd/systemd-python.template
deleted file mode 100644
index 0871e92331..0000000000
--- a/srcpkgs/systemd/systemd-python.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'systemd-python'.
-#
-short_desc="${sourcepkg} - python bindings"
-pycompile_module="systemd"
-
-do_install() {
-	vmove "usr/lib/python*" usr/lib
-}
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index b4f04e9a71..645745a044 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -15,37 +15,15 @@ configure_args="--libexecdir=/usr/lib
  --with-sysvinit-path= --with-sysvrcnd-path=
  --disable-audit --disable-static --disable-ima"
 
-depends="xbps-triggers>=0.64 dbus kbd libcap-progs
- libudev>=${version} systemd-libs>=${version}"
-
 hostmakedepends="which pkg-config intltool gperf libxslt docbook-xsl"
 
 makedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel
  liblzma-devel cryptsetup-devel libblkid-devel libglib-devel libgcrypt-devel
  python-devel gobject-introspection"
 
-# Create systemd-journal (gid 24) system group.
-system_groups="systemd-journal:24"
-
-replaces="nss-myhostname>=0 systemd-analyze>0"
-subpackages="libgudev libgudev-devel systemd-python"
-
-conf_files="
- /etc/hostname
- /etc/vconsole.conf
- /etc/locale.conf
- /etc/systemd/system.conf
- /etc/systemd/user.conf
- /etc/systemd/journald.conf
- /etc/systemd/logind.conf
- /etc/systemd/bootchart.conf
- /etc/udev/udev.conf"
-
 if [ "$CROSS_BUILD" ]; then
 	# XXX add support to gudev, introspection and python.
-	unset subpackages
-	hostmakedepends="libtool automake gettext-devel pkg-config intltool
-		     gperf libxslt docbook-xsl libgcrypt-devel"
+	hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
 	makedepends="acl-devel pam-devel dbus-devel libcap-devel
 			libkmod-devel liblzma-devel cryptsetup-devel
 			libblkid-devel libgcrypt-devel libglib-devel"
@@ -100,3 +78,56 @@ post_install() {
 	vinstall ${FILESDIR}/systemd-dirs.tmpfiles 644 \
 		usr/lib/tmpfiles.d systemd-dirs.conf
 }
+
+if [ -z "$CROSS_BUILD" ]; then
+
+libgudev_package() {
+	short_desc="GObject-based wrapper library for libudev"
+	depends="libudev>=${version}"
+	pkg_install() {
+		vmove "usr/lib/libgudev*.so*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+libgudev-devel_package() {
+	depends="libglib-devel libudev-devel libgudev>=${version}"
+	short_desc="GObject-based wrapper library for libudev - development files"
+	pkg_install() {
+		vmove usr/include/gudev-1.0
+		vmove "usr/lib/pkgconfig/gudev*"
+		vmove usr/share/gir-1.0
+	}
+}
+
+systemd-python_package() {
+	short_desc="${sourcepkg} - python bindings"
+	pycompile_module="systemd"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
+
+fi # !CROSS_BUILD
+
+systemd_package() {
+	# Create systemd-journal (gid 24) system group.
+	system_groups="systemd-journal:24"
+	replaces="nss-myhostname>=0 systemd-analyze>0"
+	conf_files="
+		/etc/hostname
+		/etc/vconsole.conf
+		/etc/locale.conf
+		/etc/systemd/system.conf
+		/etc/systemd/user.conf
+		/etc/systemd/journald.conf
+		/etc/systemd/logind.conf
+		/etc/systemd/bootchart.conf
+		/etc/udev/udev.conf"
+	depends="xbps-triggers>=0.64 dbus kbd libcap-progs
+		libudev>=${version} systemd-libs>=${version} shadow"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/systemd/template.options b/srcpkgs/systemd/template.options
deleted file mode 100644
index 015bd29895..0000000000
--- a/srcpkgs/systemd/template.options
+++ /dev/null
@@ -1,40 +0,0 @@
-# Package build options
-build_options="qrencode microhttpd tcpwrappers efi"
-desc_option_qrencode="Enable support for qrencode"
-desc_option_microhttpd="Enable support for microhttpd"
-desc_option_tcpwrappers="Enable support for tcpwrappers"
-desc_option_efi="Enable support for EFI"
-
-# Enable EFI by default on x86.
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	build_options_default="efi"
-fi
-
-do_options() {
-	if [ "$build_option_qrencode" ]; then
-		configure_args="${configure_args} --enable-qrencode"
-		makedepends="${makedepends} qrencode-devel"
-	else
-		configure_args="${configure_args} --disable-qrencode"
-	fi
-
-	if [ "$build_option_microhttpd" ]; then
-		configure_args="${configure_args} --enable-microhttpd"
-		makedepends="${makedepends} microhttpd-devel"
-	else
-		configure_args="${configure_args} --disable-microhttpd"
-	fi
-
-	if [ "$build_option_tcpwrappers" ]; then
-		configure_args="${configure_args} --enable-tcpwrappers"
-		makedepends="${makedepends} tcp_wrappers-devel"
-	else
-		configure_args="${configure_args} --disable-tcpwrappers"
-	fi
-
-	if [ "$build_option_efi" ]; then
-		configure_args="${configure_args} --enable-efi"
-	else
-		configure_args="${configure_args} --disable-efi"
-	fi
-}
diff --git a/srcpkgs/vala/libvala.template b/srcpkgs/vala/libvala.template
deleted file mode 100644
index 8b183d13ed..0000000000
--- a/srcpkgs/vala/libvala.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'libvala'.
-#
-short_desc="${short_desc} - shared library"
-
-do_install() {
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index c2b355d156..01790cc726 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -5,8 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--enable-vapigen"
 hostmakedepends="pkg-config flex libxslt"
-makedepends="libfl-devel libglib-devel"
-subpackages="libvala vala-devel"
+makedepends="libglib-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Vala"
@@ -18,3 +17,31 @@ long_desc="
  language features to GNOME developers without imposing any additional runtime
  requirements and without using a different ABI compared to applications and
  libraries written in C."
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
+libvala_package() {
+	short_desc="${short_desc} - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+vala-devel_package() {
+	depends="libglib-devel vala>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/aclocal
+		vmove usr/share/devhelp
+	}
+}
+
+vala_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/vala/vala-devel.template b/srcpkgs/vala/vala-devel.template
deleted file mode 100644
index 48f64cf49c..0000000000
--- a/srcpkgs/vala/vala-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'vala-devel'.
-#
-depends="libglib-devel vala>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/aclocal usr/share
-	vmove usr/share/devhelp usr/share
-}