diff --git a/srcpkgs/damageproto/template b/srcpkgs/damageproto/template
index a5adc25320..e4f7db01a6 100644
--- a/srcpkgs/damageproto/template
+++ b/srcpkgs/damageproto/template
@@ -1,17 +1,21 @@
 # Template build file 'damageproto'.
 pkgname=damageproto
 version=1.2.1
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=1
 short_desc="Damage extension headers from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="${XORG_HOME}"
 license="custom"
-
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b
 long_desc="
  This package contains header files and documentation for the X Damage
  extension of X RandR. This is from the modular X.org X11 project."
 
-noarch=yes
+damageproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index 6905e68c94..f1194fdc69 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -1,19 +1,24 @@
 # Template file for 'darkice'
 pkgname=darkice
 version=1.1
-build_style=gnu-configure
-homepage="http://code.google.com/p/${pkgname}/"
-distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
 revision=1
-makedepends="pkg-config lame-devel libogg-devel libvorbis-devel faac-devel alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel libstdc++-devel"
+build_style=gnu-configure
+makedepends="pkg-config lame-devel libogg-devel libvorbis-devel faac-devel
+ alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel"
 short_desc="A live audio streamer source client for icecast"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
+homepage="http://code.google.com/p/${pkgname}/"
+distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
 checksum=170342cb4dbb0b44a62e37d0db1515fa7799c410fc4995bf8f32aaa6614f5f79
 long_desc="
  DarkIce is a live audio streamer. It records audio from an audio interface
  (e.g. sound card), encodes it and sends it to a streaming server."
 
-conf_files="/etc/darkice.cfg"
-
-
+darkice_package() {
+	conf_files="/etc/darkice.cfg"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dbus-glib/dbus-glib-devel.template b/srcpkgs/dbus-glib/dbus-glib-devel.template
deleted file mode 100644
index d3517179af..0000000000
--- a/srcpkgs/dbus-glib/dbus-glib-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'dbus-glib-devel'.
-#
-depends="dbus-devel dbus-glib>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/bin usr
-	vmove usr/include usr
-	vmove usr/share usr/share
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index 37acf6f8e5..52db8351d8 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -6,10 +6,26 @@ build_style=gnu-configure
 configure_args="--disable-static --disable-bash-completion"
 hostmakedepends="pkg-config"
 makedepends="glib-devel dbus-devel"
-subpackages="$pkgname-devel"
 short_desc="GLib bindings for D-Bus"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5
+
+dbus-glib-devel_package() {
+	depends="dbus-devel dbus-glib>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove usr/share
+		vmove usr/lib/pkgconfig
+	}
+}
+
+dbus-glib_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template
index 663bd80db8..f14461bed9 100644
--- a/srcpkgs/dbus-python/template
+++ b/srcpkgs/dbus-python/template
@@ -3,8 +3,6 @@ pkgname=dbus-python
 version=1.1.0
 revision=1
 build_style=gnu-configure
-pycompile_module="dbus"
-depends="python"
 makedepends="pkg-config dbus-devel glib-devel dbus-glib-devel python-devel"
 short_desc="D-Bus Python bindings"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -18,3 +16,11 @@ long_desc="
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 }
+
+dbus-python_package() {
+	pycompile_module="dbus"
+	depends="python"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dbus/dbus-devel.template b/srcpkgs/dbus/dbus-devel.template
deleted file mode 100644
index 1d2519cf36..0000000000
--- a/srcpkgs/dbus/dbus-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'dbus-devel'.
-#
-depends="expat-devel dbus-libs>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/dbus-*" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/doc usr/share
-}
diff --git a/srcpkgs/dbus/dbus-libs.template b/srcpkgs/dbus/dbus-libs.template
deleted file mode 100644
index 3cbe22bcda..0000000000
--- a/srcpkgs/dbus/dbus-libs.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'dbus-libs'.
-#
-short_desc="${short_desc} -- shared libraries"
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
deleted file mode 100644
index df412cc6ac..0000000000
--- a/srcpkgs/dbus/dbus-x11.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'dbus-x11'.
-#
-replaces="dbus<1.4.16_2"
-short_desc="${short_desc} -- X11 support"
-
-do_install() {
-	vmove usr/bin/dbus-launch usr/bin
-	vmove usr/share/man/man1/dbus-launch.1.gz usr/share/man/man1
-}
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 6f61a3c47f..d200755ca5 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -17,10 +17,8 @@ checksum="
  e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5"
 
 create_wrksrc=yes
-subpackages="dbus-devel dbus-libs dbus-x11"
 hostmakedepends="pkg-config intltool gperf"
 makedepends="expat-devel libX11-devel libcap-devel"
-conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 
 if [ "$CROSS_BUILD" ]; then
 	_systemddir="$XBPS_CROSS_BASE"
@@ -118,3 +116,38 @@ do_install() {
 	rm -rf ${_systemddir}/include/systemd
 	rm -f ${_systemddir}/lib/libsystemd-*
 }
+
+dbus-devel_package() {
+	depends="expat-devel dbus-libs>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/dbus-*"
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+	}
+}
+
+dbus-libs_package() {
+	short_desc="${short_desc} -- shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+dbus-x11_package() {
+	replaces="dbus<1.4.16_2"
+	short_desc="${short_desc} -- X11 support"
+	pkg_install() {
+		vmove usr/bin/dbus-launch
+		vmove usr/share/man/man1/dbus-launch.1
+	}
+}
+
+dbus_package() {
+	conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dconf/dconf-devel.template b/srcpkgs/dconf/dconf-devel.template
deleted file mode 100644
index 5771ec638d..0000000000
--- a/srcpkgs/dconf/dconf-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'dconf-devel'.
-#
-depends="libglib-devel vala-devel dconf-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-	vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/dconf/dconf-editor.template b/srcpkgs/dconf/dconf-editor.template
deleted file mode 100644
index 79493d8e41..0000000000
--- a/srcpkgs/dconf/dconf-editor.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'dconf-editor'.
-#
-short_desc="${short_desc} - GTK+ editor"
-
-do_install() {
-	install -d ${DESTDIR}/usr/{bin,share}
-	mv ${SRCPKGDESTDIR}/usr/bin/dconf-editor ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/{dconf-editor,applications} \
-		${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 7b40c241c6..e9806a5351 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -3,7 +3,6 @@ pkgname=dconf
 version=0.16.0
 revision=1
 build_style=gnu-configure
-subpackages="dconf-devel dconf-editor"
 hostmakedepends="pkg-config intltool libxslt docbook-xsl"
 makedepends="vala-devel>=0.20 dbus-devel gtk+3-devel libxml2-devel"
 short_desc="A low-level configuration system"
@@ -16,3 +15,29 @@ long_desc="
  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."
+
+dconf-devel_package() {
+	depends="libglib-devel vala-devel dconf-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+		vmove usr/share/vala
+	}
+}
+
+dconf-editor_package() {
+	short_desc="${short_desc} - GTK+ editor"
+	pkg_install() {
+		vmove usr/bin/dconf-editor
+		vmove usr/share/dconf-editor
+		vmove usr/share/applications
+	}
+}
+
+dconf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index 74218037f8..ab8b33199f 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -9,12 +9,6 @@ license="GPL-2"
 distfiles="http://www.jimpryor.net/linux/releases/dcron-${version}.tar.gz"
 checksum=9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824
 
-replaces="cronie>=0"
-systemd_services="dcron.service on"
-conf_files="/var/spool/cron/root"
-provides="cron-daemon-0"
-replaces="cron-daemon>=0"
-
 # Build PIE binaries by default.
 CFLAGS="-fPIE"
 LDFLAGS="-pie"
@@ -40,3 +34,15 @@ do_install() {
 	# crontab must be setuid for all users to work!
 	chmod 4755 ${DESTDIR}/usr/bin/crontab
 }
+
+dcron_package() {
+	conf_files="/var/spool/cron/root"
+	replaces="cron-daemon>=0"
+	provides="cron-daemon-0"
+	systemd_services="dcron.service on"
+	pkg_install() {
+		vmove etc
+		vmove usr
+		vmove var
+	}
+}
diff --git a/srcpkgs/ddrescue/template b/srcpkgs/ddrescue/template
index 640725567d..3ae07619f9 100644
--- a/srcpkgs/ddrescue/template
+++ b/srcpkgs/ddrescue/template
@@ -9,3 +9,9 @@ license="GPL-3"
 homepage="http://www.gnu.org/software/ddrescue/ddrescue.html"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6
+
+ddrescue_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 89f56494e8..e684ef322d 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -4,7 +4,6 @@ version=0.5.6
 revision=2
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3 --disable-gtk2"
-depends="desktop-file-utils hicolor-icon-theme"
 makedepends="pkg-config intltool gtk+3-devel libSM-devel libICE-devel
  alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel imlib2-devel
  libjpeg-turbo-devel libpng-devel libmad-devel libflac-devel wavpack-devel
@@ -22,3 +21,10 @@ post_install() {
 	# Remove devel stuff.
 	rm -rf ${DESTDIR}/usr/include
 }
+
+deadbeef_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index d17b13b0c6..31af088a61 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,13 +1,13 @@
 # Template file for 'deheader'
 pkgname=deheader
 version=0.6
-distfiles="http://www.catb.org/~esr/deheader/$pkgname-$version.tar.gz"
-fulldepends="python"
 revision=2
+makedepends="python"
 short_desc="C and C++ header analyzer"
 homepage="http://www.catb.org/~esr/deheader/"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.catb.org/~esr/deheader/$pkgname-$version.tar.gz"
 checksum=643040b241eb47504624e9c2cc4c0f8865bf0ee2b9317ee36ee9195c75e17d4b
 long_desc="
  deheader analyzes C and C++ files to determine which header inclusions can be
@@ -15,12 +15,17 @@ long_desc="
  improvements in compilation time, especially on large C++ projects; it also
  sometimes exposes dependencies and cohesions of which developers were unaware."
 
-noarch=yes
-
-do_install()
-{
+do_install() {
 	install -d ${DESTDIR}/usr/bin
 	install -d ${DESTDIR}/usr/share/man/man1
 	install -m755 deheader ${DESTDIR}/usr/bin
 	install -m644 deheader.1 ${DESTDIR}/usr/share/man/man1
 }
+
+deheader_package() {
+	depends="python"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 227d9fa4e4..e90c1d7e94 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@@ -9,9 +9,7 @@ license="MIT, Public domain"
 distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
 checksum=82a5823a270715913af51915cc20594568f57afb7450abb989695d8808a4194d
 
-noarch=yes
-fulldepends="font-util xbps-triggers>=0.58"
-font_dirs="/usr/share/fonts/TTF"
+makedepends="font-util xbps-triggers>=0.58"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
@@ -21,3 +19,12 @@ do_install() {
 
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+dejavu-fonts-ttf_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/TTF"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template
index 7473ad9138..e1fb021adf 100644
--- a/srcpkgs/desktop-file-utils/template
+++ b/srcpkgs/desktop-file-utils/template
@@ -15,3 +15,9 @@ long_desc="
  with desktop entries and the applications database. More specifically,
  it contains the update-desktop-database utility, used to rebuild the database
  that connects MIME types to applications."
+
+desktop-file-utils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index f1b722a2fe..2f0b62c2e4 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -1,22 +1,19 @@
 # Template file for 'dev86'
 pkgname=dev86
 version=0.16.19
-distfiles="http://www.debath.co.uk/dev86/Dev86src-$version.tar.gz"
 revision=1
-fulldepends="bin86"
+makedepends="bin86"
 short_desc="8086 cross development compiler, assembler and linker"
 homepage="http://www.debath.co.uk/dev86/"
 license="GPL+, GPL-2+, LGPL-2+"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://www.debath.co.uk/dev86/Dev86src-$version.tar.gz"
 checksum=33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e
 long_desc="
  This package provides a cross development C compiler, assembler and linker
  environment for the production of 8086 executables (Optionally MSDOS COM)."
 
-nostrip=yes
-
-do_build()
-{
+do_build() {
 	for f in libc/bcc libc/misc libc/msdos libc/string libc/syscall \
 		libc/bios; do
 		sed -i -e "s|\$(CCFLAGS) ||g" ${wrksrc}/${f}/Makefile
@@ -24,8 +21,7 @@ do_build()
 	make DIST=${DESTDIR}
 }
 
-do_install()
-{
+do_install() {
 	make DIST=${DESTDIR} MANDIR=/usr/share/man \
 		install install-man
 
@@ -33,3 +29,11 @@ do_install()
 	rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86
 	rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1
 }
+
+dev86_package() {
+	depends="bin86"
+	nostrip=yes
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index 6f56269a8c..afea4c66d7 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -14,3 +14,9 @@ checksum=efc61733dae4f5f5e74930a25f5632ff5732ecbcabf50f189c10e5e024c5fb45
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+dgen-sdl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template
index 8fdcbe54e9..85def49e1a 100644
--- a/srcpkgs/dhcpcd-dbus/template
+++ b/srcpkgs/dhcpcd-dbus/template
@@ -2,16 +2,22 @@
 pkgname=dhcpcd-dbus
 version=0.4.2
 revision=3
-distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$version.tar.bz2"
 build_style=gnu-makefile
-makedepends="pkg-config dbus-devel"
-fulldepends="dhcpcd dbus"
+makedepends="pkg-config dbus-devel dhcpcd dbus"
 short_desc="dhcpcd D-Bus interface"
 homepage="http://roy.marples.name/projects/dhcpcd-dbus"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$version.tar.bz2"
 checksum=beaf6c45b0066530576d44357ae8a4b32dd036c200910eb5ca5364dc8d4dc996
 long_desc="
  dhcpcd-dbus is the dhcpcd D-Bus interface, receives interface configuration
  events from the dhcpcd control socket and emits them to the DBus listeners."
 
+dhcpcd-dbus_package() {
+	depends="dhcpcd dbus"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 13fe20923a..4b41a844d0 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -3,15 +3,13 @@ pkgname=dhcpcd-gtk
 version=0.6.0
 revision=1
 wrksrc=dhcpcd-ui-${version}
-distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2"
 build_style=gnu-configure
-depends="glibc dbus-libs gtk+ libnotify"
-makedepends="pkg-config gtk+-devel libnotify-devel dbus-devel"
-fulldepends="dhcpcd dhcpcd-dbus"
+makedepends="pkg-config gtk+-devel libnotify-devel dbus-devel dhcpcd dhcpcd-dbus"
 short_desc="GTK+ monitor and configuration GUI for dhcpcd"
 homepage="http://roy.marples.name/projects/dhcpcd-ui"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2"
 checksum=1dc2ca46aebd41821d11f02182a694307fb26533effbbb95fd718c49156e3745
 long_desc="
  Network Configurator is a GTK+ monitor and configuration GUI for dhcpcd.
@@ -26,3 +24,9 @@ long_desc="
  to, if they're encrypted or not and their overall quality. You can click
  on one to configure the PSK or WEP key 0 for it."
 
+dhcpcd-gtk_package() {
+	depends="dhcpcd dhcpcd-dbus"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index fbcb55b2b0..6fff872fa3 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -6,7 +6,6 @@ build_style=configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib
  --sysconfdir=/etc --rundir=/run"
 makedepends="which ntp"
-conf_files="/etc/dhcpcd.conf"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
@@ -19,3 +18,11 @@ post_install() {
 	vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system
 }
+
+dhcpcd_package() {
+	conf_files="/etc/dhcpcd.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index dd44043b61..eb9b42145b 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -20,3 +20,9 @@ long_desc="
  these types of dialog boxes are implemented:
  yes/no box, menu box, input box, message box, text box, info box,
  guage box, checklist box, and radiolist box."
+
+dialog_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 7c219e4a2b..f58051246c 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -3,7 +3,6 @@ pkgname=diffutils
 version=3.3
 revision=1
 build_style=gnu-configure
-conflicts="chroot-diffutils>=0"
 short_desc="The GNU diff utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/diffutils"
@@ -15,3 +14,10 @@ long_desc="
  features are a superset of the Unix features and they are significantly
  faster. Cmp has been moved into this package from the GNU textutils package.
  These programs are usually used for creating patch files."
+
+diffutils_package() {
+	conflicts="chroot-diffutils>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/distcc/distcc-pump.template b/srcpkgs/distcc/distcc-pump.template
deleted file mode 100644
index 0e45d99674..0000000000
--- a/srcpkgs/distcc/distcc-pump.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'distcc-pump'.
-#
-depends="distcc-${version}_${revision}"
-short_desc="${short_desc} -- Pump mode support files"
-pycompile_module="include_server"
-
-do_install() {
-	vmove usr/bin/pump usr/bin
-	vmove usr/share/man/man1/pump.1.gz usr/share/man/man1
-	vmove usr/share/man/man1/include_server.1.gz usr/share/man/man1
-	vmove usr/lib/python2.7 usr/lib
-	vmove usr/share/doc/distcc/README.pump usr/share/doc/distcc
-}
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index ee0335b124..62f7935123 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -2,7 +2,6 @@
 pkgname=distcc
 version=3.2rc1
 revision=5
-subpackages="distcc-pump"
 build_style=gnu-configure
 configure_args="--disable-Werror"
 makedepends="pkg-config python-devel popt-devel avahi-libs-devel"
@@ -13,12 +12,6 @@ license="GPL-2"
 distfiles="http://distcc.googlecode.com/files/${pkgname}-${version}.tar.bz2"
 checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
 
-conflicts="chroot-distcc>=0"
-
-conf_files="
-/etc/distcc/hosts
-/etc/distcc/clients.allow"
-
 post_install() {
 	# Remove useless files.
 	rm -f ${DESTDIR}/etc/default/distcc
@@ -34,3 +27,27 @@ post_install() {
 		ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
 	done
 }
+
+distcc-pump_package() {
+	depends="distcc-${version}_${revision}"
+	short_desc="${short_desc} -- Pump mode support files"
+	pycompile_module="include_server"
+	pkg_install() {
+		vmove usr/bin/pump
+		vmove usr/share/man/man1/pump.1.gz
+		vmove usr/share/man/man1/include_server.1.gz
+		vmove usr/lib/python2.7
+		vmove usr/share/doc/distcc/README.pump
+	}
+}
+
+distcc_package() {
+	conflicts="chroot-distcc>=0"
+	conf_files="
+		/etc/distcc/hosts
+		/etc/distcc/clients.allow"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/djvulibre/djvulibre-devel.template b/srcpkgs/djvulibre/djvulibre-devel.template
deleted file mode 100644
index 7f8fd1a92c..0000000000
--- a/srcpkgs/djvulibre/djvulibre-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'djvulibre-devel'.
-#
-noarch=yes
-depends="libjpeg-turbo-devel libdjvulibre>=${version}"
-short_desc="Development files for the DjVu image format"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/djvulibre/libdjvulibre.template b/srcpkgs/djvulibre/libdjvulibre.template
deleted file mode 100644
index 49093a45ad..0000000000
--- a/srcpkgs/djvulibre/libdjvulibre.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libdjvulibre'.
-#
-short_desc="Runtime support for the DjVu image format"
-long_desc="${long_desc}
-
- This package contains the DjVu runtime library."
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 4f1ac53896..4e3c8d330c 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -1,9 +1,8 @@
 # Template file for 'djvulibre'
 pkgname=djvulibre
 version=3.5.24
-revision=4
+revision=5
 build_style=gnu-configure
-subpackages="lib${pkgname} ${pkgname}-devel"
 configure_args="--disable-desktopfiles"
 makedepends="pkg-config tiff-devel"
 short_desc="Utilities for the DjVu image format"
@@ -12,3 +11,26 @@ license="GPL-2"
 homepage="http://djvu.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/djvu/$pkgname-$version.tar.gz"
 checksum=c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
+
+libdjvulibre_package() {
+	short_desc="Runtime support for the DjVu image format"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+djvulibre-devel_package() {
+	depends="libjpeg-turbo-devel libdjvulibre>=${version}"
+	short_desc="Development files for the DjVu image format"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+djvulibre_package() {
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share
+	}
+}
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index deab675c54..73b07c3803 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,10 +1,9 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.2.0.3
+revision=3
 homepage="http://linux.dell.com/dkms"
 distfiles="${homepage}/permalink/dkms-$version.tar.gz"
-depends="bash module-init-tools gcc make coreutils kernel-headers"
-revision=3
 short_desc="Dynamic Kernel Modules System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -13,12 +12,7 @@ long_desc="
  dkms is a framework which allows kernel modules to be dynamically built for
  each kernel on your system in a simplified and organized fashion."
 
-conf_files="/etc/dkms/framework.conf"
-noarch=yes
-
-
-do_install()
-{
+do_install() {
 	# We are only interested in the bare minimum.
 	vinstall dkms 755 usr/sbin
 	vinstall dkms.8 644 usr/share/man/man8
@@ -31,3 +25,13 @@ do_install()
 	vinstall ${FILESDIR}/kernel.d/dkms.prerm 750 \
 		etc/kernel.d/pre-remove 20-dkms
 }
+
+dkms_package() {
+	conf_files="/etc/dkms/framework.conf"
+	noarch="yes"
+	depends="bash module-init-tools gcc make coreutils kernel-headers"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dmd/libphobos.template b/srcpkgs/dmd/libphobos.template
deleted file mode 100644
index df17979e13..0000000000
--- a/srcpkgs/dmd/libphobos.template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'libphobos'.
-#
-short_desc="The phobos D standard library for DMD"
-license="Boost License"
-
-do_install() {
-	vinstall src/druntime/lib/libdruntime-linux${_archbits}.a \
-		644 usr/lib libdruntime.a
-	vinstall src/phobos/generated/linux/release/$_archbits/libphobos2.a \
-		644 usr/lib libphobos2.a
-
-	vmkdir usr/include/d
-	cp -r src/phobos/{*.d,etc,std} ${DESTDIR}/usr/include/d
-
-	vmkdir usr/include/d/druntime
-	cp -r src/druntime/import ${DESTDIR}/usr/include/d/druntime
-
-	vmkdir usr/share/doc/d/
-	cp -r html ${DESTDIR}/usr/share/doc/d/
-	find ${DESTDIR}/usr/share/doc/d -type f | xargs chmod 0644
-
-	vinstall src/druntime/LICENSE 644 usr/share/licenses/libphobos
-}
diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index a6130a7e85..04601b0c69 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -10,16 +10,14 @@ license="GPL-2"
 distfiles="http://ftp.digitalmars.com/dmd.${version}.zip"
 checksum="13b546b69d628280f245ab19bf4ed27ab66a0085afdaf950e075e68acc7f4c93"
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_archbits=64
-elif [ "$XBPS_MACHINE" = "i686" ]; then
+elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_archbits=32
 fi
 
 disable_debug=yes
-subpackages="libphobos"
 makedepends="unzip"
-depends="libphobos>=${version} gcc"
 
 do_build() {
 	cd src
@@ -51,3 +49,32 @@ do_install() {
 		vinstall linux/bin${_archbits}/${f} 755 usr/bin
 	done
 }
+
+libphobos_package() {
+	short_desc="The phobos D standard library for DMD"
+	license="Boost License"
+	pkg_install() {
+		vinstall src/druntime/lib/libdruntime-linux${_archbits}.a 644 usr/lib libdruntime.a
+		vinstall src/phobos/generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a
+
+		vmkdir usr/include/d
+		cp -r src/phobos/{*.d,etc,std} ${PKGDESTDIR}/usr/include/d
+
+		vmkdir usr/include/d/druntime
+		cp -r src/druntime/import ${PKGDESTDIR}/usr/include/d/druntime
+
+		vmkdir usr/share/doc/d/
+		cp -r html ${PKGDESTDIR}/usr/share/doc/d/
+		find ${PKGDESTDIR}/usr/share/doc/d -type f | xargs chmod 0644
+
+		vinstall src/druntime/LICENSE 644 usr/share/licenses/libphobos
+	}
+}
+
+dmd_package() {
+	depends="libphobos>=${version} gcc"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template
index 141c6d6ba1..b450a03b7b 100644
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@@ -23,3 +23,9 @@ do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
+
+dmenu_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
index 653821097b..7a47f1eea8 100644
--- a/srcpkgs/dmidecode/template
+++ b/srcpkgs/dmidecode/template
@@ -1,16 +1,15 @@
 # Template file for 'dmidecode'
 pkgname=dmidecode
 version=2.11
-distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr"
 make_install_args="prefix=/usr"
-revision=1
-fulldepends="glibc"
 short_desc="Desktop Management Interface table related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.nongnu.org/dmidecode"
 license="GPL-2"
+distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51
 long_desc="
  $pkgname reports information about x86 and ia64 hardware as described in
@@ -23,3 +22,8 @@ long_desc="
  slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
  I/O ports (e.g. serial, parallel, USB)."
 
+dmidecode_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 5317badfdd..1aa6102ac3 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -8,9 +8,7 @@ wrksrc="${pkgname}"
 build_wrksrc="${_distver}-${_patchver}/${pkgname}"
 build_style=gnu-configure
 configure_args="--enable-led --enable-intel_led --enable-shared_lib"
-depends="device-mapper>=2.02.95_3"
 makedepends="device-mapper-devel>=2.02.95_3"
-systemd_services="dmraid.service off"
 short_desc="Device mapper RAID interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -40,3 +38,11 @@ post_install() {
 	# systemd service.
 	vinstall ${FILESDIR}/dmraid.service 644 usr/lib/systemd/system
 }
+
+dmraid_package() {
+	systemd_services="dmraid.service off"
+	depends="device-mapper>=2.02.95_3"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dmxproto/template b/srcpkgs/dmxproto/template
index 37b5c571b8..0e445707a3 100644
--- a/srcpkgs/dmxproto/template
+++ b/srcpkgs/dmxproto/template
@@ -13,4 +13,9 @@ long_desc="
  Distributed Multi-headed X protocol headers from modular X.org:
  your networked Xinerama."
 
-noarch=yes
+dmxproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 035d12388a..839bedef43 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -18,9 +18,6 @@ long_desc="
  each host or in a central configuration file. Dnsmasq supports static and
  dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines."
 
-system_accounts="dnsmasq"
-conf_files="/etc/dnsmasq.conf"
-
 do_build() {
 	echo '#define HAVE_DBUS' >> src/config.h
 	make ${makejobs}
@@ -33,3 +30,12 @@ do_install() {
 	vinstall ${FILESDIR}/dnsmasq.service 644 usr/lib/systemd/system
 	vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d
 }
+
+dnsmasq_package() {
+	conf_files="/etc/dnsmasq.conf"
+	system_accounts="dnsmasq"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/docbook-dsssl/template b/srcpkgs/docbook-dsssl/template
index db738ca635..f0cb92fa4b 100644
--- a/srcpkgs/docbook-dsssl/template
+++ b/srcpkgs/docbook-dsssl/template
@@ -1,13 +1,13 @@
 # Template file for 'docbook-dsssl'
 pkgname=docbook-dsssl
 version=1.79
-distfiles="${SOURCEFORGE_SITE}/docbook/$pkgname-$version.tar.bz2"
-fulldepends="xmlcatmgr docbook-xml>=4.2"
 revision=1
+makedepends="xmlcatmgr docbook-xml>=4.2"
 short_desc="DSSSL stylesheets for the DocBook DTD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.docbook.org/"
 license="MIT"
+distfiles="${SOURCEFORGE_SITE}/docbook/$pkgname-$version.tar.bz2"
 checksum=2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc
 long_desc="
  The DocBook XSL stylesheets provide a serie of ready-to-use templates to
@@ -20,13 +20,17 @@ long_desc="
  into smaller files that are easier to write and maintain than one big
  stylesheet."
 
-noarch=yes
-
-
-export sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --"
-
 do_install() {
 	rm -rf ${wrksrc}/docsrc
 	install -d ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular
 	cp -rp ${wrksrc}/* ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular
 }
+
+docbook-dsssl_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index cf3b9082ce..157d46c65b 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -8,8 +8,7 @@ distfiles="
  http://www.oasis-open.org/docbook/xml/4.4/$pkgname-4.4.zip
  http://www.oasis-open.org/docbook/xml/4.3/$pkgname-4.3.zip
  http://www.oasis-open.org/docbook/xml/4.2/$pkgname-4.2.zip"
-makedepends="bsdtar"
-fulldepends="xmlcatmgr"
+makedepends="bsdtar xmlcatmgr"
 homepage="http://www.oasis-open.org/docbook/"
 license="MIT"
 short_desc="XML DTD designed for computer documentation"
@@ -29,21 +28,8 @@ long_desc="
  Dozens of organizations use DocBook for millions of pages of
  documentation, in various print and online formats, worldwide."
 
-noarch=yes
 noextract=yes
 
-xml_entries="
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2
- nextCatalog /usr/share/xml/docbook/4.2/catalog --
- nextCatalog /usr/share/xml/docbook/4.3/catalog --
- nextCatalog /usr/share/xml/docbook/4.4/catalog --
- nextCatalog /usr/share/xml/docbook/4.5/catalog --
- nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --"
-
 do_install() {
 	local versions="4.2 4.3 4.4 4.5"
 	local ver dir
@@ -59,3 +45,22 @@ do_install() {
 	sed -e 's|V4.2|V4.1.2|g' < ${dir}/catalog > ${dir}/catalog-4.1.2
 	chmod 644 ${dir}/catalog-4.1.2
 }
+
+docbook-xml_package() {
+	depends="xmlcatmgr"
+	noarch="yes"
+	xml_entries="
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2
+ nextCatalog /usr/share/xml/docbook/4.2/catalog --
+ nextCatalog /usr/share/xml/docbook/4.3/catalog --
+ nextCatalog /usr/share/xml/docbook/4.4/catalog --
+ nextCatalog /usr/share/xml/docbook/4.5/catalog --
+ nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template
index 30fa0aabc0..cbf7c5d7ec 100644
--- a/srcpkgs/docbook-xsl/template
+++ b/srcpkgs/docbook-xsl/template
@@ -2,7 +2,7 @@
 pkgname=docbook-xsl
 version=1.77.1
 revision=2
-fulldepends="xmlcatmgr docbook-xml>=4.2"
+makedepends="xmlcatmgr docbook-xml>=4.2"
 short_desc="Docbook XSL modular stylesheet"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://docbook.sourceforge.net/"
@@ -20,9 +20,6 @@ long_desc="
  into smaller files that are easier to write and maintain than one big
  stylesheet."
 
-noarch=yes
-xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --"
-
 do_install() {
 	local xslmods="common eclipse epub fo highlighting html htmlhelp \
 			images javahelp lib manpages params profiling \
@@ -39,3 +36,12 @@ do_install() {
 
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+docbook-xsl_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template
index 1ac7c95950..caa8d439bd 100644
--- a/srcpkgs/docbook/template
+++ b/srcpkgs/docbook/template
@@ -2,32 +2,31 @@
 pkgname=docbook
 version=4.5
 distfiles="
-http://www.docbook.org/sgml/$version/$pkgname-$version.zip
-http://www.docbook.org/sgml/4.4/$pkgname-4.4.zip
-http://www.docbook.org/sgml/4.3/$pkgname-4.3.zip
-http://www.docbook.org/sgml/4.2/$pkgname-4.2.zip
-http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
-http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
-http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
-http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
-http://www.oasis-open.org/docbook/sgml/2.4.1/docbk241.zip"
-makedepends="bsdtar"
-fulldepends="xmlcatmgr ISOEnts"
+ http://www.docbook.org/sgml/$version/$pkgname-$version.zip
+ http://www.docbook.org/sgml/4.4/$pkgname-4.4.zip
+ http://www.docbook.org/sgml/4.3/$pkgname-4.3.zip
+ http://www.docbook.org/sgml/4.2/$pkgname-4.2.zip
+ http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
+ http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
+ http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
+ http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
+ http://www.oasis-open.org/docbook/sgml/2.4.1/docbk241.zip"
+makedepends="bsdtar xmlcatmgr ISOEnts"
 revision=1
 short_desc="SGML DTD designed for computer documentation"
 homepage="http://www.docbook.org"
 license="Copyright only"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43
-0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
-88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee
-67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3
-deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
-dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb
-20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
-ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
-dbac0694e9bcaec43cab80c755ffb02cf8f613bf785ff8506e5ed72efa76a272"
+ 8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43
+ 0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
+ 88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee
+ 67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3
+ deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
+ dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb
+ 20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
+ ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
+ dbac0694e9bcaec43cab80c755ffb02cf8f613bf785ff8506e5ed72efa76a272"
 long_desc="
  DocBook provides a system for writing structured documents using
  SGML or XML. It is particularly well-suited to books and papers
@@ -38,21 +37,8 @@ long_desc="
  Dozens of organizations use DocBook for millions of pages of
  documentation, in various print and online formats, worldwide."
 
-noarch=yes
 noextract=yes
 
-
-export sgml_entries="
-CATALOG /usr/share/sgml/docbook/2.4.1/catalog --
-CATALOG /usr/share/sgml/docbook/3.0/catalog --
-CATALOG /usr/share/sgml/docbook/3.1/catalog --
-CATALOG /usr/share/sgml/docbook/4.0/catalog --
-CATALOG /usr/share/sgml/docbook/4.1/catalog --
-CATALOG /usr/share/sgml/docbook/4.2/catalog --
-CATALOG /usr/share/sgml/docbook/4.3/catalog --
-CATALOG /usr/share/sgml/docbook/4.4/catalog --
-CATALOG /usr/share/sgml/docbook/4.5/catalog --"
-
 do_install() {
 	local ver dir
 
@@ -71,3 +57,21 @@ do_install() {
 		install -m644 ${FILESDIR}/catalog${vernodot} ${dir}/catalog
 	done
 }
+
+docbook_package() {
+	depends="xmlcatmgr ISOEnts"
+	noarch="yes"
+	sgml_entries="
+CATALOG /usr/share/sgml/docbook/2.4.1/catalog --
+CATALOG /usr/share/sgml/docbook/3.0/catalog --
+CATALOG /usr/share/sgml/docbook/3.1/catalog --
+CATALOG /usr/share/sgml/docbook/4.0/catalog --
+CATALOG /usr/share/sgml/docbook/4.1/catalog --
+CATALOG /usr/share/sgml/docbook/4.2/catalog --
+CATALOG /usr/share/sgml/docbook/4.3/catalog --
+CATALOG /usr/share/sgml/docbook/4.4/catalog --
+CATALOG /usr/share/sgml/docbook/4.5/catalog --"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template
index 456e94173d..02983fff8b 100644
--- a/srcpkgs/docbook2x/template
+++ b/srcpkgs/docbook2x/template
@@ -1,26 +1,31 @@
 # Template file for 'docbook2x'
 pkgname=docbook2x
 version=0.8.8
+revision=2
 patch_args="-Np1"
 wrksrc="docbook2X-${version}"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/docbook2X-$version.tar.gz"
 build_style=gnu-configure
-revision=2
-fulldepends="texinfo libxslt docbook docbook-dsssl docbook-xsl perl-XML-SAX"
+makedepends="texinfo libxslt docbook docbook-dsssl docbook-xsl perl-XML-SAX"
 short_desc="DocBook converter to UNIX manpage and GNU Texinfo format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://docbook2x.sourceforge.net"
 license="MIT"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/docbook2X-$version.tar.gz"
 checksum=4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45
 long_desc="
  docbook2X is a software package that converts DocBook documents into the
  traditional Unix man page format and the GNU Texinfo format."
 
-export xml_entries="
-nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
-nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
-
-
 post_install() {
 	sed -i -e 's|${prefix}|/usr|g' ${DESTDIR}/usr/bin/*
 }
+
+docbook2x_package() {
+	depends="${makedepends}"
+	xml_entries="
+nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
+nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template
index 83a81acce6..4fc97128b6 100644
--- a/srcpkgs/dosbox/template
+++ b/srcpkgs/dosbox/template
@@ -30,3 +30,9 @@ post_install() {
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 }
+
+dosbox_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template
index f01162656e..a4eee1a9d2 100644
--- a/srcpkgs/dosfstools/template
+++ b/srcpkgs/dosfstools/template
@@ -14,3 +14,9 @@ long_desc="
  The dosfstools package includes the mkdosfs (a.k.a. mkfs.dos and mkfs.vfat)
  and dosfsck (a.k.a. fsck.msdos and fsck.vfat) utilities, which respectively
  make and check MS-DOS FAT filesystems on hard drives or on floppies."
+
+dosfstools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dovecot/dovecot-plugin-ldap.template b/srcpkgs/dovecot/dovecot-plugin-ldap.template
deleted file mode 100644
index 283d28a65d..0000000000
--- a/srcpkgs/dovecot/dovecot-plugin-ldap.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'dovecot-plugin-ldap'.
-#
-depends="dovecot>=${version}"
-short_desc="${short_desc} - LDAP plugin"
-conf_files="/etc/dovecot/conf.d/auth-ldap.conf.ext"
-
-do_install() {
-	vmove usr/lib/dovecot/modules/auth/libauthdb_ldap.so \
-		usr/lib/dovecot/modules/auth
-	vmove usr/share/doc/dovecot/example-config/conf.d/auth-ldap.conf.ext \
-		usr/share/doc/dovecot/example-config/conf.d
-	vmove etc/dovecot/conf.d/auth-ldap.conf.ext \
-		etc/dovecot/conf.d
-}
diff --git a/srcpkgs/dovecot/dovecot-plugin-mysql.template b/srcpkgs/dovecot/dovecot-plugin-mysql.template
deleted file mode 100644
index de2667921d..0000000000
--- a/srcpkgs/dovecot/dovecot-plugin-mysql.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'dovecot-plugin-mysql'.
-#
-depends="dovecot>=${version}"
-short_desc="${short_desc} - MySQL plugin"
-
-do_install() {
-	vmove usr/lib/dovecot/modules/auth/libdriver_mysql.so \
-		usr/lib/dovecot/modules/auth
-	vmove usr/lib/dovecot/modules/dict/libdriver_mysql.so \
-		usr/lib/dovecot/modules/dict
-	vmove usr/lib/dovecot/modules/libdriver_mysql.so \
-		usr/lib/dovecot/modules
-}
diff --git a/srcpkgs/dovecot/dovecot-plugin-pgsql.template b/srcpkgs/dovecot/dovecot-plugin-pgsql.template
deleted file mode 100644
index bcff95a550..0000000000
--- a/srcpkgs/dovecot/dovecot-plugin-pgsql.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'dovecot-plugin-pgsql'.
-#
-depends="dovecot>=${version}"
-short_desc="${short_desc} - PostgreSQL plugin"
-
-do_install() {
-	vmove usr/lib/dovecot/modules/auth/libdriver_pgsql.so \
-		usr/lib/dovecot/modules/auth
-	vmove usr/lib/dovecot/modules/dict/libdriver_pgsql.so \
-		usr/lib/dovecot/modules/dict
-	vmove usr/lib/dovecot/modules/libdriver_pgsql.so \
-		usr/lib/dovecot/modules
-}
diff --git a/srcpkgs/dovecot/dovecot-plugin-sqlite.template b/srcpkgs/dovecot/dovecot-plugin-sqlite.template
deleted file mode 100644
index 958ebab81d..0000000000
--- a/srcpkgs/dovecot/dovecot-plugin-sqlite.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'dovecot-plugin-sqlite'.
-#
-depends="dovecot>=${version}"
-short_desc="${short_desc} - SQLite plugin"
-
-do_install() {
-	vmove usr/lib/dovecot/modules/auth/libdriver_sqlite.so \
-		usr/lib/dovecot/modules/auth
-	vmove usr/lib/dovecot/modules/dict usr/lib/dovecot/modules
-	vmove usr/lib/dovecot/modules/libdriver_sqlite.so \
-		usr/lib/dovecot/modules
-}
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 797fd49dcb..ee0d5a606b 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -15,42 +15,6 @@ homepage="http://dovecot.org"
 distfiles="${homepage}/releases/2.1/${pkgname}-${version}.tar.gz"
 checksum=706a69cede44551401dc5f49225b97b4b7b7e30ddbdc5cc11176a23a0fa72ded
 
-subpackages="${pkgname}-plugin-ldap ${pkgname}-plugin-mysql
- ${pkgname}-plugin-pgsql ${pkgname}-plugin-sqlite"
-
-systemd_services="dovecot.service true"
-system_accounts="dovecot dovenull"
-dovecot_homedir="/var/chroot"
-dovenull_homedir="/var/chroot"
-
-conf_files="
-/etc/dovecot/conf.d/10-auth.conf
-/etc/dovecot/conf.d/10-director.conf
-/etc/dovecot/conf.d/10-logging.conf
-/etc/dovecot/conf.d/10-mail.conf
-/etc/dovecot/conf.d/10-master.conf
-/etc/dovecot/conf.d/10-ssl.conf
-/etc/dovecot/conf.d/15-lda.conf
-/etc/dovecot/conf.d/20-imap.conf
-/etc/dovecot/conf.d/20-lmtp.conf
-/etc/dovecot/conf.d/20-pop3.conf
-/etc/dovecot/conf.d/90-acl.conf
-/etc/dovecot/conf.d/90-plugin.conf
-/etc/dovecot/conf.d/90-quota.conf
-/etc/dovecot/conf.d/auth-checkpassword.conf.ext
-/etc/dovecot/conf.d/auth-deny.conf.ext
-/etc/dovecot/conf.d/auth-master.conf.ext
-/etc/dovecot/conf.d/auth-passwdfile.conf.ext
-/etc/dovecot/conf.d/auth-sql.conf.ext
-/etc/dovecot/conf.d/auth-static.conf.ext
-/etc/dovecot/conf.d/auth-system.conf.ext
-/etc/dovecot/conf.d/auth-vpopmail.conf.ext
-/etc/dovecot/dovecot.conf
-/etc/ssl/dovecot-openssl.cnf"
-
-# For SSL support.
-depends="openssl>=0"
-
 makedepends="openssl-devel mit-krb5-devel libmysqlclient-devel>=5.5.27
  postgresql-libs-devel sqlite-devel libldap-devel libcap-devel pam-devel
  libcurl-devel expat-devel"
@@ -74,3 +38,81 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/share/aclocal
 }
+
+dovecot-plugin-ldap_package() {
+	depends="dovecot>=${version}"
+	short_desc="${short_desc} - LDAP plugin"
+	conf_files="/etc/dovecot/conf.d/auth-ldap.conf.ext"
+	pkg_install() {
+		vmove usr/lib/dovecot/modules/auth/libauthdb_ldap.so
+		vmove usr/share/doc/dovecot/example-config/conf.d/auth-ldap.conf.ext
+		vmove etc/dovecot/conf.d/auth-ldap.conf.ext
+	}
+}
+
+dovecot-plugin-mysql_package() {
+	depends="dovecot>=${version}"
+	short_desc="${short_desc} - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/dovecot/modules/auth/libdriver_mysql.so
+		vmove usr/lib/dovecot/modules/dict/libdriver_mysql.so
+		vmove usr/lib/dovecot/modules/libdriver_mysql.so
+	}
+}
+
+dovecot-plugin-pgsql_package() {
+	depends="dovecot>=${version}"
+	short_desc="${short_desc} - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/dovecot/modules/auth/libdriver_pgsql.so
+		vmove usr/lib/dovecot/modules/dict/libdriver_pgsql.so
+		vmove usr/lib/dovecot/modules/libdriver_pgsql.so
+	}
+}
+
+dovecot-plugin-sqlite_package() {
+	depends="dovecot>=${version}"
+	short_desc="${short_desc} - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/dovecot/modules/auth/libdriver_sqlite.so
+		vmove usr/lib/dovecot/modules/dict
+		vmove usr/lib/dovecot/modules/libdriver_sqlite.so
+	}
+}
+
+dovecot_package() {
+	systemd_services="dovecot.service true"
+	system_accounts="dovecot dovenull"
+	dovecot_homedir="/var/chroot"
+	dovenull_homedir="/var/chroot"
+	conf_files="
+		/etc/dovecot/conf.d/10-auth.conf
+		/etc/dovecot/conf.d/10-director.conf
+		/etc/dovecot/conf.d/10-logging.conf
+		/etc/dovecot/conf.d/10-mail.conf
+		/etc/dovecot/conf.d/10-master.conf
+		/etc/dovecot/conf.d/10-ssl.conf
+		/etc/dovecot/conf.d/15-lda.conf
+		/etc/dovecot/conf.d/20-imap.conf
+		/etc/dovecot/conf.d/20-lmtp.conf
+		/etc/dovecot/conf.d/20-pop3.conf
+		/etc/dovecot/conf.d/90-acl.conf
+		/etc/dovecot/conf.d/90-plugin.conf
+		/etc/dovecot/conf.d/90-quota.conf
+		/etc/dovecot/conf.d/auth-checkpassword.conf.ext
+		/etc/dovecot/conf.d/auth-deny.conf.ext
+		/etc/dovecot/conf.d/auth-master.conf.ext
+		/etc/dovecot/conf.d/auth-passwdfile.conf.ext
+		/etc/dovecot/conf.d/auth-sql.conf.ext
+		/etc/dovecot/conf.d/auth-static.conf.ext
+		/etc/dovecot/conf.d/auth-system.conf.ext
+		/etc/dovecot/conf.d/auth-vpopmail.conf.ext
+		/etc/dovecot/dovecot.conf
+		/etc/ssl/dovecot-openssl.cnf"
+	# For SSL support.
+	depends="openssl>=0"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/doxygen/doxygen-gui.template b/srcpkgs/doxygen/doxygen-gui.template
deleted file mode 100644
index 5c94358a1e..0000000000
--- a/srcpkgs/doxygen/doxygen-gui.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'doxygen-gui'.
-#
-depends="doxygen>=${version}"
-short_desc="Qt GUI configuration tool for doxygen"
-
-do_install() {
-	vmove usr/bin/doxywizard usr/bin
-	vmove usr/share/man/man1/doxywizard.1 usr/share/man/man1
-}
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index a1fab2f5ae..91fcf7e02b 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -22,3 +22,18 @@ do_build() {
 do_install() {
 	make INSTALL=${DESTDIR}/usr MAN1DIR=share/man/man1 install
 }
+
+doxygen-gui_package() {
+	depends="doxygen>=${version}"
+	short_desc="Qt GUI configuration tool for doxygen"
+	pkg_install() {
+		vmove usr/bin/doxywizard
+		vmove usr/share/man/man1/doxywizard.1
+	}
+}
+
+doxygen_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dracut/dracut-network.template b/srcpkgs/dracut/dracut-network.template
deleted file mode 100644
index d6f0fc387c..0000000000
--- a/srcpkgs/dracut/dracut-network.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'dracut-network'
-#
-depends="dracut>=${version}"
-short_desc="${short_desc} - network modules"
-noarch=yes
-
-do_install() {
-	for f in 40network 90livenet 95fcoe 95iscsi \
-		95nbd 95nfs 95zfcp 95znet; do
-		vmove usr/lib/dracut/modules.d/${f} usr/lib/dracut/modules.d
-	done
-}
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 2cbfe4da53..f1f717ec16 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -5,11 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_build_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
 make_install_args="sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system"
-depends="psmisc>=22.14_2 cpio xz systemd>=199"
 makedepends="libxslt docbook-xsl asciidoc"
-conf_files="/etc/dracut.conf"
-make_dirs="/etc/dracut.conf.d 0755 root root"
-subpackages="dracut-network"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 short_desc="A new initramfs infrastructure"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -34,3 +30,25 @@ post_install() {
 	vinstall ${FILESDIR}/kernel-hook-postrm \
 		755 etc/kernel.d/post-remove 10-dracut
 }
+
+dracut-network_package() {
+	depends="dracut>=${version}"
+	short_desc="${short_desc} - network modules"
+	noarch=yes
+	pkg_install() {
+		for f in 40network 90livenet 95fcoe 95iscsi \
+		    95nbd 95nfs 95zfcp 95znet; do
+			vmove usr/lib/dracut/modules.d/${f}
+		done
+	}
+}
+
+dracut_package() {
+	depends="psmisc>=22.14_2 cpio xz systemd>=199"
+	conf_files="/etc/dracut.conf"
+	make_dirs="/etc/dracut.conf.d 0755 root root"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dri2proto/template b/srcpkgs/dri2proto/template
index 75cabc2f4e..0f12fc806a 100644
--- a/srcpkgs/dri2proto/template
+++ b/srcpkgs/dri2proto/template
@@ -2,7 +2,6 @@
 pkgname=dri2proto
 version=2.8
 revision=2
-noarch=yes
 build_style=gnu-configure
 short_desc="Direct Rendering Interface 2 prototypes"
 homepage="http://xorg.freedesktop.org"
@@ -12,3 +11,10 @@ distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
 long_desc="
  Definitions needed by Direct Rendering Interface version 2."
+
+dri2proto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template
index ce1e659408..c5631557f6 100644
--- a/srcpkgs/dssi-vst/template
+++ b/srcpkgs/dssi-vst/template
@@ -2,13 +2,12 @@
 pkgname=dssi-vst
 version="0.9.2.$(date -u +%Y%m%d)"
 revision=1
-homepage="http://breakfastquay.com/dssi-vst/"
-depends="dssi ladspa-sdk ladspa-sdk-progs"
-makedepends="pkg-config jack-devel alsa-lib-devel libstdc++-devel
+makedepends="pkg-config jack-devel alsa-lib-devel
  liblo-devel dssi-devel ladspa-sdk wine-unstable wine-unstable-devel"
 short_desc="Run Windows VST plugins on Linux"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL"
+homepage="http://breakfastquay.com/dssi-vst/"
 long_desc="
  dssi-vst is an adapter that allows users of Linux audio software to take VST
  and VSTi audio effects and instrument plugins compiled for Windows, and load
@@ -20,25 +19,28 @@ only_for_archs=i686
 nofetch=yes
 noextract=yes
 
-do_fetch()
-{
+do_fetch() {
 	local url="git://github.com/falkTX/dssi-vst.git"
 	msg_normal " Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
 
-do_configure()
-{
+do_configure() {
 	sed -i -e "s|/usr/local|/usr|" Makefile
 	sed -i -e 's/LINK_FLAGS   =/& -pthread -lrt/' Makefile
 }
 
-do_build()
-{
+do_build() {
 	make ${makejobs} DESTDIR=${DESTDIR}
 }
 
-do_install()
-{
+do_install() {
 	make ${makejobs} DESTDIR=${DESTDIR} install
 }
+
+dssi-vst_package() {
+	depends="dssi ladspa-sdk ladspa-sdk-progs"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dssi/dssi-devel.template b/srcpkgs/dssi/dssi-devel.template
deleted file mode 100644
index 22f411417f..0000000000
--- a/srcpkgs/dssi/dssi-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'dssi-devel'.
-#
-depends="glibc-devel dssi"
-short_desc="${short_desc} - Development files"
-long_desc="${long_desc}
-
- This package contains files for development: headers, etc."
-
-
-do_install()
-{
-        vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/dssi/dssi-example-plugins.template b/srcpkgs/dssi/dssi-example-plugins.template
deleted file mode 100644
index 33856e865a..0000000000
--- a/srcpkgs/dssi/dssi-example-plugins.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'dssi-example-plugins-devel'.
-#
-depends="dssi"
-short_desc="${short_desc} - Example plugins"
-long_desc="${long_desc}
-
- This package contains the example plugins."
-
-
-do_install()
-{
-        vmove usr/lib/dssi usr/lib
-}
diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index 739e3ab43a..b13c7912b4 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,19 +1,40 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-build_style=gnu-configure
-homepage="http://dssi.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 revision=2
-makedepends="pkg-config glibc-devel libstdc++-devel qt-devel libX11-devel liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel ladspa-sdk libSM-devel"
+build_style=gnu-configure
+makedepends="pkg-config glibc-devel libstdc++-devel qt-devel libX11-devel
+ liblo-devel libsndfile-devel libsamplerate-devel alsa-lib-devel jack-devel
+ ladspa-sdk libSM-devel"
 short_desc="API for audio processing plugins"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
+homepage="http://dssi.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e
 long_desc="
  DSSI is an API for audio processing plugins, particularly useful for software
  synthesis plugins with user interfaces."
 
-subpackages="$pkgname-devel $pkgname-example-plugins"
+dssi-devel_package() {
+	depends="dssi>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
 
+dssi-example-plugins_package() {
+	depends="dssi>=${version}"
+	short_desc="${short_desc} - Example plugins"
+	pkg_install() {
+        	vmove usr/lib/dssi
+	}
+}
 
+dssi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index d687b808dd..3eab4f12e0 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -1,13 +1,12 @@
 # Template file for 'dtach'
 pkgname=dtach
 version=0.8
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 revision=1
-makedepends="glibc-devel"
 short_desc="dtach is a tiny program that emulates the detach feature of screen"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dtach.sourceforge.net/"
 license="GPL-2"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9
 long_desc="
  dtach is a tiny program that emulates the detach feature of screen, allowing
@@ -16,15 +15,18 @@ long_desc="
  the screen, and thus works best with programs that know how to redraw 
  themselves."
 
-
-do_build()
-{
+do_build() {
 	./configure --prefix=/usr
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	install -Dm755 dtach "${DESTDIR}/usr/bin/dtach"
 	install -Dm644 dtach.1 "${DESTDIR}/usr/share/man/man1/dtach.1"
 }
+
+dtach_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template
index 27234637d7..02b6b7c62d 100644
--- a/srcpkgs/dumpet/template
+++ b/srcpkgs/dumpet/template
@@ -12,3 +12,9 @@ distfiles="https://fedorahosted.org/releases/d/u/dumpet/dumpet-$version.tar.bz2"
 checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3
 long_desc="
  This package contains dumpet, a $short_desc."
+
+dumpet_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template
index af70f462ed..f4ee0f2d9e 100644
--- a/srcpkgs/dvtm/template
+++ b/srcpkgs/dvtm/template
@@ -24,3 +24,9 @@ do_install() {
 	# Install terminfo file to the correct dir.
 	vinstall dvtm.info 644 usr/share/terminfo/d
 }
+
+dvtm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index 9da1865433..27a2ff27c5 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -1,10 +1,10 @@
 # Template file for 'dwm'
 pkgname=dwm
 version=6.0
+revision=1
 homepage="http://dwm.suckless.org"
 distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz"
 makedepends="libX11-devel libXinerama-devel"
-revision=1
 short_desc="A dynamic window manager for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -14,7 +14,6 @@ long_desc="
  and floating layouts. All of the layouts can be applied dynamically,
  optimising the environment for the application in use and the task performed."
 
-
 do_build() {
 	cp ${FILESDIR}/config.h config.h
 	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
@@ -31,3 +30,9 @@ do_install() {
 	vinstall README 644 usr/share/doc/$pkgname
 	vinstall ${FILESDIR}/dwm.desktop 644 usr/share/xsessions
 }
+
+dwm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}