diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 2c2aed2f4d0..d53cb8e43c7 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="freetype-devel SDL-devel MesaLib-devel"
+makedepends="freetype-devel SDL-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
diff --git a/srcpkgs/orc/orc-devel.template b/srcpkgs/orc/orc-devel.template
deleted file mode 100644
index 0d47509e92f..00000000000
--- a/srcpkgs/orc/orc-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'orc-devel'.
-#
-noarch=yes
-depends="orc>=${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/gtk-doc usr/share
-}
diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 3462dcb710d..cf0821b122c 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -1,11 +1,10 @@
 # Template build file for 'orc'.
 pkgname=orc
 version=0.4.16
-revision=1
-subpackages="orc-devel"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config"
+hostmakedepends="pkg-config"
 short_desc="The Oild Runtime Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.entropywave.com/orc/"
@@ -21,3 +20,19 @@ long_desc="
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/orc
 }
+
+orc-devel_package() {
+	depends="orc>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
+}
+
+orc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/physfs/physfs-devel.template b/srcpkgs/physfs/physfs-devel.template
deleted file mode 100644
index 5918b81b09f..00000000000
--- a/srcpkgs/physfs/physfs-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'physfs-devel'.
-#
-depends="readline-devel zlib-devel physfs-${version}_${revision}"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-}
diff --git a/srcpkgs/physfs/template b/srcpkgs/physfs/template
index 3480c711e9b..99a7c782118 100644
--- a/srcpkgs/physfs/template
+++ b/srcpkgs/physfs/template
@@ -1,12 +1,12 @@
 # Template file for 'physfs'
 pkgname=physfs
 version=2.0.3
-revision=1
-subpackages="$pkgname-devel"
+revision=2
 build_style=cmake
 configure_args="-DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF
  -DPHYSFS_BUILD_STATIC=OFF"
-makedepends="cmake zlib-devel readline-devel"
+hostmakedepends="cmake"
+makedepends="zlib-devel readline-devel"
 short_desc="Library to provide abstract access to various archives"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://icculus.org/physfs/"
@@ -18,3 +18,17 @@ long_desc="
  by Quake 3's file subsystem. The programmer defines a write directory on
  the physical filesystem. No file writing done through the PhysicsFS API can
  leave that write directory, for security."
+
+physfs-devel_package() {
+	depends="readline-devel zlib-devel physfs-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+physfs_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/pulseaudio/libpulseaudio.template b/srcpkgs/pulseaudio/libpulseaudio.template
deleted file mode 100644
index ad835414f78..00000000000
--- a/srcpkgs/pulseaudio/libpulseaudio.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'libpulseaudio'.
-#
-short_desc="${short_desc} - shared libraries"
-long_desc="
- PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
- WIN32 systems. It is a drop in replacement for the ESD sound server with
- much better latency, mixing/re-sampling quality and overall architecture.
-
- This package provides client libraries used by applications that access a
- PulseAudio sound server via PulseAudio's native interface."
-
-do_install() {
-	vmove "usr/lib/libpulse.so*" usr/lib
-	vmove "usr/lib/libpulse-simple.so*" usr/lib
-	vmove "usr/lib/libpulse-mainloop-glib.so*" usr/lib
-	vmove usr/lib/pulseaudio usr/lib
-}
diff --git a/srcpkgs/pulseaudio/pulseaudio-devel.template b/srcpkgs/pulseaudio/pulseaudio-devel.template
deleted file mode 100644
index 0a8b66131ae..00000000000
--- a/srcpkgs/pulseaudio/pulseaudio-devel.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'pulseaudio-devel'.
-#
-noarch=yes
-depends="libasyncns-devel dbus-devel libXtst-devel
- libpulseaudio-${version}_${revision}"
-short_desc="${short_desc} - development files"
-long_desc="
- PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
- WIN32 systems. It is a drop in replacement for the ESD sound server with much
- better latency, mixing/re-sampling quality and overall architecture.
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/lib/cmake usr/lib
-	vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index a1b7414e2e3..c51d1479bec 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=3.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
@@ -11,9 +11,7 @@ makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel
  libasyncns-devel dbus-devel tdb-devel libcap-devel libbluetooth-devel
  avahi-libs-devel openssl-devel libsamplerate-devel json-c-devel orc-devel
  jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel sbc-devel
- libcap-progs"
-fulldepends="rtkit"
-subpackages="libpulseaudio $pkgname-devel"
+ libcap-progs rtkit"
 short_desc="A featureful, general-purpose sound server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PulseAudio"
@@ -45,14 +43,42 @@ long_desc="
   * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp
     lirc and avahi, just to name a few."
 
-conf_files="
-/etc/pulse/system.pa
-/etc/pulse/daemon.conf
-/etc/pulse/client.conf
-/etc/pulse/default.pa"
-
 post_install() {
 	vinstall ${FILESDIR}/pulseaudio.xinit 755 \
 		etc/X11/xinit/xinitrc.d pulseaudio
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
 }
+
+libpulseaudio_package() {
+	short_desc="${short_desc} - shared libraries"
+	pkg_install() {
+		vmove "usr/lib/libpulse.so*"
+		vmove "usr/lib/libpulse-simple.so*"
+		vmove "usr/lib/libpulse-mainloop-glib.so*"
+		vmove usr/lib/pulseaudio
+	}
+}
+
+pulseaudio-devel_package() {
+	depends="libasyncns-devel dbus-devel libXtst-devel
+		libpulseaudio-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove usr/share/vala
+	}
+}
+
+pulseaudio_package() {
+	conf_files="
+		/etc/pulse/system.pa
+		/etc/pulse/daemon.conf
+		/etc/pulse/client.conf
+		/etc/pulse/default.pa"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index 0e6e0b9ae06..6500d7fa0f6 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,7 +1,7 @@
 # Template file for 'rtkit'
 pkgname=rtkit
 version=0.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lrt --with-systemdsystemunitdir=/usr/lib/systemd/system"
 short_desc="Realtime Policy and Watchdog Daemon"
@@ -12,8 +12,6 @@ distfiles="http://0pointer.de/public/$pkgname-$version.tar.xz"
 checksum=68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0
 
 makedepends="pkg-config dbus-devel libcap-devel"
-system_accounts="rtkit"
-rtkit_homedir="/proc"
 
 post_install() {
 	# DBus configuration
@@ -21,3 +19,12 @@ post_install() {
 	./rtkit-daemon --introspect > \
 		${DESTDIR}/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml
 }
+
+rtkit_package() {
+	depends="shadow"
+	system_accounts="rtkit"
+	rtkit_homedir="/proc"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/sbc/sbc-devel.template b/srcpkgs/sbc/sbc-devel.template
deleted file mode 100644
index 55c7190bf94..00000000000
--- a/srcpkgs/sbc/sbc-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'sbc-devel'.
-#
-noarch=yes
-depends="sbc>=$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
-}
diff --git a/srcpkgs/sbc/template b/srcpkgs/sbc/template
index 93d72e5f43b..01e28a09201 100644
--- a/srcpkgs/sbc/template
+++ b/srcpkgs/sbc/template
@@ -1,16 +1,29 @@
 # Template file for 'sbc'
 pkgname=sbc
 version=1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pie --disable-static"
-subpackages="sbc-devel"
-makedepends="pkg-config libsndfile-devel"
+hostmakedepends="pkg-config"
+makedepends="libsndfile-devel"
 short_desc="SBC library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
 license="GPL-2"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
 checksum=bf970aa21226c594bb04ba3d949770c8fd91dc8f953556305f20c1016b16b882
-long_desc="
- This package implements a ${short_desc}."
+
+sbc-devel_package() {
+	depends="sbc>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+sbc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/speex/libspeex.template b/srcpkgs/speex/libspeex.template
deleted file mode 100644
index bdf6a9de96a..00000000000
--- a/srcpkgs/speex/libspeex.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'libspeex'.
-#
-short_desc="${short_desc} - shared libraries"
-long_desc="
- Speex is an audio codec especially designed for compressing voice at low
- bit-rates for applications such as voice over IP (VoIP). In some senses, it
- is meant to be complementary to the Vorbis codec which places a greater
- emphasis on high-quality music reproduction.
-
- This package contains the Speex runtime shared libraries."
-
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/speex/speex-devel.template b/srcpkgs/speex/speex-devel.template
deleted file mode 100644
index 28a5ac0cdfb..00000000000
--- a/srcpkgs/speex/speex-devel.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'speex-devel'.
-#
-noarch=yes
-depends="libspeex-${version}_${revision}"
-short_desc="${sourcepkg} development files"
-long_desc="
- Speex is an audio codec especially designed for compressing voice at low
- bit-rates for applications such as voice over IP (VoIP). In some senses, it
- is meant to be complementary to the Vorbis codec which places a greater
- emphasis on high-quality music reproduction.
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
-	install -d ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{doc,aclocal} ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index fa7c2dd2aaa..186f640fbd1 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -1,11 +1,11 @@
 # Template file for 'speex'.
 pkgname=speex
 version=1.2rc1
-revision=5
-subpackages="libspeex $pkgname-devel"
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libogg-devel"
+hostmakedepends="pkg-config"
+makedepends="libogg-devel"
 short_desc="A free codec for free speech"
 homepage="http://www.speex.org"
 license="BSD"
@@ -16,6 +16,28 @@ long_desc="
  Speex is an audio codec especially designed for compressing voice at low
  bit-rates for applications such as voice over IP (VoIP). In some senses, it
  is meant to be complementary to the Vorbis codec which places a greater
- emphasis on high-quality music reproduction.
+ emphasis on high-quality music reproduction."
 
- This package contains the encoder and decoder command-line applications."
+libspeex_package() {
+	short_desc="${short_desc} - shared libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+speex-devel_package() {
+	depends="libspeex-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove usr/share/aclocal
+	}
+}
+
+speex_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/tdb/libtdb.template b/srcpkgs/tdb/libtdb.template
deleted file mode 100644
index 1ae30810f46..00000000000
--- a/srcpkgs/tdb/libtdb.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libtdb'.
-#
-short_desc="Trivial Database - shared library"
-long_desc="${long_desc}
-
- This package contains the shared library file."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/tdb/tdb-devel.template b/srcpkgs/tdb/tdb-devel.template
deleted file mode 100644
index ac7e9965f43..00000000000
--- a/srcpkgs/tdb/tdb-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'tdb-devel'.
-#
-depends="libtdb-${version}_${revision}"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/tdb/tdb-python.template b/srcpkgs/tdb/tdb-python.template
deleted file mode 100644
index 4de2138084c..00000000000
--- a/srcpkgs/tdb/tdb-python.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'tdb-python'.
-#
-short_desc="Trivial Database - python bindings"
-long_desc="${long_desc}
-
- This package contains the Python bindings to the libtdb."
-
-do_install() {
-	vmove "usr/lib/python*" usr/lib
-}
diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 2f9de874020..fbc3b7f98ce 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -1,10 +1,9 @@
 # Template build file for 'tdb'.
 pkgname=tdb
 version=1.2.11
-revision=1
-subpackages="libtdb tdb-devel tdb-python"
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config python-devel libxslt docbook-xsl"
+hostmakedepends="pkg-config python-devel libxslt docbook-xsl"
 short_desc="Hierarchical pool based memory allocator with destructors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -15,3 +14,32 @@ long_desc="
  This is a simple database API. It is modelled after the structure of GDBM.
  TDB features, unlike GDBM, multiple writers support with appropriate locking
  and transactions."
+
+tdb-devel_package() {
+	depends="libtdb-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+libtdb_package() {
+	short_desc="Trivial Database - shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+tdb-python_package() {
+	short_desc="Trivial Database - python bindings"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
+
+tdb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index 7b1faf9cc23..fd05169b6fd 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -1,13 +1,13 @@
 # Template file for 'webrtc-audio-processing'
 pkgname=webrtc-audio-processing
 version=0.1
-homepage="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
-distfiles="$homepage/$pkgname-$version.tar.xz"
+revision=2
 build_style=gnu-configure
-revision=1
 short_desc="AudioProcessing library based on Google's implementation of WebRTC"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
+homepage="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
+distfiles="$homepage/$pkgname-$version.tar.xz"
 checksum=ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc
 long_desc="
  This package contains an ${short_desc}:
@@ -16,9 +16,23 @@ long_desc="
 
  Which has been converted to be built with GNU autotools."
 
-subpackages="$pkgname-devel"
-
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 	vinstall PATENTS 644 usr/share/licenses/${pkgname}
 }
+
+webrtc-audio-processing-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+webrtc-audio-processing_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template b/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template
deleted file mode 100644
index d3ab5e2ea59..00000000000
--- a/srcpkgs/webrtc-audio-processing/webrtc-audio-processing-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'webrtc-audio-processing--devel'.
-#
-depends="glibc-devel webrtc-audio-processing>=0.1"
-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/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index c0b6e947f95..9ff00b71b43 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -1,10 +1,11 @@
 # Template build for 'xcb-util'.
 pkgname=xcb-util
 version=0.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config gperf libxcb-devel>=1.8"
+hostmakedepends="pkg-config gperf"
+makedepends="libxcb-devel>=1.8"
 short_desc="XCB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"
@@ -19,4 +20,17 @@ long_desc="
  libraries also provide client-side code which is not strictly part of
  the X protocol but which have traditionally been provided by Xlib."
 
-subpackages="$pkgname-devel"
+xcb-util-devel_package() {
+	depends="libxcb-devel xcb-util>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xcb-util_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/xcb-util/xcb-util-devel.template b/srcpkgs/xcb-util/xcb-util-devel.template
deleted file mode 100644
index 3e5f091d574..00000000000
--- a/srcpkgs/xcb-util/xcb-util-devel.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'xcb-util-devel'.
-#
-noarch=yes
-depends="libxcb-devel xcb-util>=${version}"
-short_desc="${sourcepkg} -- 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
-}