diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 8c615daa3e6..38559ccbc5e 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -1,14 +1,14 @@
 # Template build file for 'm4'.
 pkgname=m4
 version=1.4.16
-distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-changeword --enable-threads"
-revision=2
 short_desc="GNU version of UNIX m4 macro language processor"
 homepage="https://www.gnu.org/software/m4/"
 license="GPL-3"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2"
 checksum=42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c
 long_desc="
  GNU m4 is an implementation of the traditional UNIX macro
@@ -20,4 +20,10 @@ long_desc="
 
 pre_configure() {
 	sed -i -e '/gets is a/d' lib/stdio.in.h
-}
\ No newline at end of file
+}
+
+m4_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index eaf6c50cdc2..7989f038749 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,16 +1,15 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
+revision=2
 patch_args="-Np1"
 wrksrc=mailx-${version}
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/mailx/mailx-12.5.tar.xz/836bf1da322d2d1f78b7056c2b3b2304/${pkgname}-${version}.tar.xz"
-depends="glibc libssl mit-krb5-libs"
 makedepends="openssl-devel mit-krb5-devel"
-revision=2
 short_desc="Feature-rich BSD mail(1)"
 homepage="http://heirloom.sourceforge.net/mailx.html"
 license="Custom"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://pkgs.fedoraproject.org/repo/pkgs/mailx/mailx-12.5.tar.xz/836bf1da322d2d1f78b7056c2b3b2304/${pkgname}-${version}.tar.xz"
 checksum=1b8136fb2466adeaf71a5e3c65db9fa1a967f1f6469ff689c2cf06e21f638823
 long_desc="
  Mailx is an enhanced mail command, which provides the functionality
@@ -30,12 +29,9 @@ long_desc="
  (which should be compatible with its predecessors from the mailx-8.x source),
  as well as "nail" (the initial name of this project)."
 
-conf_files="/etc/mail.rc"
 disable_parallel_build=yes
 
-
-do_build()
-{
+do_build() {
 	echo	PREFIX=/usr 		\
 		BINDIR=/bin 		\
 		MANDIR=/usr/share/man	\
@@ -45,17 +41,23 @@ do_build()
 		UCBINSTALL=install	\
 	> ${wrksrc}/makeflags
 
-	make $(cat makeflags) CFLAGS="${XBPS_CFLAGS} -D_GNU_SOURCE" \
-		IPv6=-DHAVE_IPv6_FUNCS || return 1
+	make $(cat makeflags) CFLAGS="${CFLAGS} -D_GNU_SOURCE" \
+		IPv6=-DHAVE_IPv6_FUNCS
 }
 
-do_install()
-{
-	make DESTDIR=${DESTDIR} $(cat makeflags) install || return 1
+do_install() {
+	make DESTDIR=${DESTDIR} $(cat makeflags) install
 
-	cd ${wrksrc} && \
-		ln -s mailx ${DESTDIR}/bin/mail && \
-		ln -s mailx ${DESTDIR}/bin/Mail && \
-		ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1 && \
-		ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/Mail.1
+	ln -s mailx ${DESTDIR}/bin/mail
+	ln -s mailx ${DESTDIR}/bin/Mail
+	ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1
+	ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/Mail.1
+}
+
+mailx_package() {
+	conf_files="/etc/mail.rc"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
 }
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index d3d435084e2..4930017b576 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -2,7 +2,6 @@
 pkgname=make
 version=3.82
 revision=5
-conflicts="chroot-make>=0"
 build_style=gnu-configure
 short_desc="The GNU make system"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,3 +9,10 @@ homepage="http://www.gnu.org/software/make"
 license="GPL-3"
 distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
 checksum=e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966
+
+make_package() {
+	conflicts="chroot-make>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index 4fd7b13cd00..70bb8627803 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -1,14 +1,14 @@
 # Template build for 'makedepend'.
 pkgname=makedepend
 version=1.0.1
-distfiles="${XORG_SITE}/util/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
-makedepends="pkg-config xproto"
+build_style=gnu-configure
+hostmakedepends="pkg-config xproto"
 short_desc="A dependency generator for makefiles"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/util/$pkgname-$version.tar.bz2"
 checksum=b752ad9f210f82d480c8bf397d62649a4306a5534bc38ae7765b9bfbd416b1d2
 long_desc="
  Makedepend is a makefile dependency generator from The XFree86 Project, Inc. 
@@ -20,3 +20,8 @@ long_desc="
  directives can reference files having other include directives, and parsing
  will occur in these files as well."
 
+makedepend_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template
index 7131aab2a6b..a9fc0998511 100644
--- a/srcpkgs/makeself/template
+++ b/srcpkgs/makeself/template
@@ -1,13 +1,13 @@
 # Template file for 'makeself'
 pkgname=makeself
 version=2.1.5
-distfiles="http://megastep.org/$pkgname/$pkgname-$version.run"
-fulldepends="tar gzip bzip2>=0"
 revision=2
+noextract=yes
 short_desc="Make self-extractable archives on Unix"
 homepage="http://www.megastep.org/makeself/"
 license="GPL-2+"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://megastep.org/$pkgname/$pkgname-$version.run"
 checksum=8227668bb35c34d86e6f0fe69c7bf4bd2813f51edfcbfc227896b4787b0a1a4e
 long_desc="
  makeself.sh is a small shell script that generates a self-extractable tar.gz
@@ -19,21 +19,13 @@ long_desc="
  Makeself archives also include checksums for integrity self-validation
  (CRC and/or MD5 checksums)."
 
-noarch=yes
-noextract=yes
-
-
-do_build()
-{
+do_build() {
 	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}.run .
 	chmod +x ${pkgname}-${version}.run
 	./${pkgname}-${version}.run
 }
 
-do_install()
-{
-	local f
-
+do_install() {
 	cd ${wrksrc}/${pkgname}-${version}
 	install -d ${DESTDIR}/usr/share/man/man1
 	for f in makeself makeself-header; do
@@ -41,3 +33,11 @@ do_install()
 	done
 	install -m644 *.1 ${DESTDIR}/usr/share/man/man1
 }
+
+makeself_package() {
+	depends="tar gzip bzip2"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 23b1adc25cf..a58f958b845 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -9,8 +9,6 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
  --without-included-regex --enable-automatic-create"
 hostmakedepends="pkg-config groff"
 makedepends="gdbm-devel zlib-devel libpipeline-devel"
-depends="bzip2 gzip less groff grep coreutils"
-conf_files="/etc/man_db.conf"
 short_desc="The on-line manual database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -22,3 +20,12 @@ post_install() {
 	# Install the cron daily job.
 	vinstall ${FILESDIR}/man-db.cron-daily 744 etc/cron.daily man-db
 }
+
+man-db_package() {
+	conf_files="/etc/man_db.conf"
+	depends="bzip2 gzip less groff grep coreutils"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 7f4c56350c2..7ef6b61b666 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -35,3 +35,10 @@ do_install() {
 	# From attr-devel.
 	rm -f man2/*xattr.2
 }
+
+man-pages_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mash/mash-devel.template b/srcpkgs/mash/mash-devel.template
deleted file mode 100644
index 6322165a95a..00000000000
--- a/srcpkgs/mash/mash-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'mash-devel'.
-#
-depends="clutter-devel>=1.12 mash>=${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
-	vmove usr/share/gtk-doc usr/share
-	vmove "usr/share/gir-*" usr/share
-}
diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template
index 7824cff08ac..4c69f7d6041 100644
--- a/srcpkgs/mash/template
+++ b/srcpkgs/mash/template
@@ -1,11 +1,11 @@
 # Template file for 'mash'
 pkgname=mash
 version=0.2.0
-revision=2
-subpackages="mash-devel"
+revision=3
 build_style=gnu-configure
 configure_args="--enable-introspection --disable-static"
-makedepends="pkg-config intltool gobject-introspection clutter-devel>=1.12"
+hostmakedepends="pkg-config intltool gobject-introspection"
+makedepends="clutter-devel>=1.12"
 short_desc="A small library for using 3D models within a Clutter scene"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -17,3 +17,20 @@ long_desc="
  scene. Models can be exported from Blender or other 3D modelling
  software as PLY files and then used as actors. It also supports a
  lighting model with animatable lights."
+
+mash-devel_package() {
+	depends="clutter-devel>=1.12 mash>=${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/gir-*"
+	}
+}
+
+mash_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 7d15b742190..896af54bf33 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -4,7 +4,8 @@ version=4.8.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-screen=ncurses --without-x"
-makedepends="pkg-config glib-devel e2fsprogs-devel ncurses-devel libssh2-devel"
+hostmakedepends="pkg-config"
+makedepends="libglib-devel e2fsprogs-devel ncurses-devel libssh2-devel"
 short_desc="User-friendly file manager and visual shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -12,14 +13,20 @@ homepage="http://www.ibiblio.org/mc/"
 distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
 checksum=88f620f7944d629087e0f3518a7e7bff7600fd1c4fa157767cdcca95f2cb3074
 
-conf_files="
- /etc/mc/filehighlight.ini
- /etc/mc/mc.ext
- /etc/mc/mcedit.menu
- /etc/mc/sfs.ini
- /etc/mc/mc.keymap.default
- /etc/mc/mc.menu
- /etc/mc/edit.indent.rc
- /etc/mc/mc.keymap
- /etc/mc/mc.menu.sr
- /etc/mc/mc.keymap.emac"
+mc_package() {
+	conf_files="
+		/etc/mc/filehighlight.ini
+		/etc/mc/mc.ext
+		/etc/mc/mcedit.menu
+		/etc/mc/sfs.ini
+		/etc/mc/mc.keymap.default
+		/etc/mc/mc.menu
+		/etc/mc/edit.indent.rc
+		/etc/mc/mc.keymap
+		/etc/mc/mc.menu.sr
+		/etc/mc/mc.keymap.emac"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mcpp/libmcpp.template b/srcpkgs/mcpp/libmcpp.template
deleted file mode 100644
index 3302ff48cab..00000000000
--- a/srcpkgs/mcpp/libmcpp.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'libmcpp'.
-#
-short_desc="${short_desc} - Runtime library"
-long_desc="${long_desc}
-
- This package contains the mcpp runtime library"
-
-
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/mcpp/mcpp-devel.template b/srcpkgs/mcpp/mcpp-devel.template
deleted file mode 100644
index 330b8970360..00000000000
--- a/srcpkgs/mcpp/mcpp-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'mcpp-devel'.
-#
-depends="glibc-devel mcpp"
-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/*.a" usr/lib
-}
diff --git a/srcpkgs/mcpp/template b/srcpkgs/mcpp/template
index 435667e0ab8..804adb8e8d0 100644
--- a/srcpkgs/mcpp/template
+++ b/srcpkgs/mcpp/template
@@ -1,14 +1,14 @@
 # Template file for 'mcpp'
 pkgname=mcpp
 version=2.7.2
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+revision=4
 build_style=gnu-configure
 configure_args="--enable-mcpplib"
 homepage="http://mcpp.sourceforge.net/"
 license="BSD"
-revision=3
 short_desc="Portable C preprocessor"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864
 long_desc="
  mcpp is a C/C++ preprocessor with the following features:
@@ -31,5 +31,24 @@ long_desc="
  * Is an open source software released under BSD-style-license.
  * It is probably number one C/C++ preprocessor now available in the world."
 
-subpackages="lib$pkgname $pkgname-devel"
+libmcpp_package() {
+	short_desc="${short_desc} - Runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
 
+mcpp-devel_package() {
+	depends="mcpp>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+mcpp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template
index 5a3cb53e823..55e85564bda 100644
--- a/srcpkgs/mda-lv2/template
+++ b/srcpkgs/mda-lv2/template
@@ -1,12 +1,11 @@
 # Template file for 'mda-lv2'
 pkgname=mda-lv2
 version=1.0.0
+revision=1
 build_style=waf
 homepage="http://drobilla.net/software/mda-lv2/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-revision=1
-makedepends="pkg-config"
-fulldepends="lv2 python"
+makedepends="pkg-config lv2 python"
 short_desc="LV2 port of the MDA plugins by Paul Kellett."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-3"
@@ -21,3 +20,9 @@ long_desc="
  and thanks to several bug fixes this collection should be more reliable than
  the original."
 
+mda-lv2_package() {
+	depends="lv2 python"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mdbtools/libmdb.template b/srcpkgs/mdbtools/libmdb.template
deleted file mode 100644
index a0a12c5c675..00000000000
--- a/srcpkgs/mdbtools/libmdb.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'libmdb'.
-#
-short_desc="${short_desc} (Runtime library)"
-long_desc="${long_desc}
-
- This package contains the mdbtools runtime lib(s)."
-
-do_install()
-{
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/mdbtools/mdbtools-devel.template b/srcpkgs/mdbtools/mdbtools-devel.template
deleted file mode 100644
index 86635768def..00000000000
--- a/srcpkgs/mdbtools/mdbtools-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'mdbtools-devel'.
-#
-depends="libmdb"
-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/*.a" usr
-}
diff --git a/srcpkgs/mdbtools/mdbtools-docs.template b/srcpkgs/mdbtools/mdbtools-docs.template
deleted file mode 100644
index 21b90ac0e99..00000000000
--- a/srcpkgs/mdbtools/mdbtools-docs.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'mdbtools-docs'.
-#
-short_desc="${short_desc} (Documentation)"
-long_desc="${long_desc}
-
- This package contains the mdbtools manpage(s)."
-
-do_install()
-{
-	vmove usr/share/man usr/share
-}
diff --git a/srcpkgs/mdbtools/template b/srcpkgs/mdbtools/template
index 1186415d926..94554c03dfa 100644
--- a/srcpkgs/mdbtools/template
+++ b/srcpkgs/mdbtools/template
@@ -1,15 +1,16 @@
 # Template file for 'mdbtools'
 pkgname=mdbtools
 version=0.5
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-glibtest --enable-sql"
-makedepends="flex bison pkg-config glib-devel"
-revision=1
+hostmakedepends="flex bison pkg-config"
+makedepends="libglib-devel"
 short_desc="Library and utilities for reading Microsoft Access Databases"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mdbtools.sourceforge.net/"
 license="GPL-2, LGPL-2.1"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=7a5db39fecff5ce4fb91e019acf5795b40221aff09bbd6d84f8dec60f017b05d
 long_desc="
  The MDB Tools project is a effort to document the MDB file format used in
@@ -19,5 +20,32 @@ long_desc="
  Specifically, MDB Tools includes programs to export schema and data to other
  databases such as MySQL, Oracle, Sybase, PostgreSQL, and others."
 
-subpackages="${pkgname}-devel ${pkgname}-docs libmdb"
+mdbtools-devel_package() {
+	depends="libmdb>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+        	vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
 
+mdbtools-docs_package() {
+	noarch=yes
+	short_desc+=" -- Documentation"
+	pkg_install() {
+		vmove usr/share/man
+	}
+}
+
+libmdb_package() {
+	short_desc+=" -- runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+mdbtools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 187899707fe..13d28a486e5 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -2,6 +2,7 @@
 pkgname=mdocml
 version=1.12.1
 revision=1
+makedepends="db-devel"
 short_desc="mdoc macro compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -15,10 +16,6 @@ long_desc="
  implementation, for displaying -mdoc pages whilst providing token support
  for -man."
 
-makedepends="db-devel"
-conflicts="groff>=0 man-db>=0"
-provides="man-${version} roff-${version} apropos-${version} whatis-${version}"
-
 do_build() {
 	make ${makejobs}
 }
@@ -43,3 +40,11 @@ do_install() {
 	# Create mandoc -> man symlink.
 	ln -sfr ${DESTDIR}/usr/bin/mandoc ${DESTDIR}/usr/bin/man
 }
+
+mdocml_package() {
+	conflicts="groff>=0 man-db>=0"
+	provides="man-${version} roff-${version} apropos-${version} whatis-${version}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 753305bb21f..de166f3fee3 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -5,8 +5,8 @@ revision=1
 build_style=gnu-makefile
 make_build_args="prefix=/usr"
 make_install_args="prefix=/usr"
-makedepends="pkg-config intltool gnome-doc-utils"
-fulldepends="pygtk pygtksourceview desktop-file-utils hicolor-icon-theme"
+hostmakedepends="pkg-config intltool gnome-doc-utils"
+makedepends="pygtk pygtksourceview desktop-file-utils hicolor-icon-theme"
 short_desc="Visual diff and merge tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://meldmerge.org/"
@@ -22,5 +22,11 @@ long_desc="
  Meld helps you review code changes and understand patches. It might even help
  you to figure out what is going on in that merge you keep avoiding."
 
-noarch=yes
-pycompile_dirs="usr/lib/meld/meld/"
+meld_package() {
+	noarch="yes"
+	pycompile_dirs="usr/lib/meld/meld/"
+	depends="${makedepends}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index b5f9e376495..ef564e567b5 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -14,3 +14,9 @@ makedepends="libevent-devel"
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
 }
+
+memcached_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index 9ff3ca0be2d..78f552a410e 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -7,9 +7,7 @@ distfiles="http://www.memtest.org/download/$version/$pkgname-$version.tar.gz"
 short_desc="An Advanced Memory Diagnostic Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-nostrip=yes
-noverifyrdeps=yes
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	makedepends="gcc-multilib"
 fi
 checksum=5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737
@@ -31,3 +29,12 @@ do_install() {
 	vinstall memtest.bin 755 boot memtest86+
 	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }
+
+memtest86+_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	pkg_install() {
+		vmove boot
+		vmove etc
+	}
+}
diff --git a/srcpkgs/menu-cache/menu-cache-devel.template b/srcpkgs/menu-cache/menu-cache-devel.template
deleted file mode 100644
index 2dfaf1e9a89..00000000000
--- a/srcpkgs/menu-cache/menu-cache-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'menu-cache-devel'.
-#
-noarch=yes
-depends="glib-devel ${sourcepkg}-${version}_${revision}"
-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/menu-cache/template b/srcpkgs/menu-cache/template
index df517ce8a92..d833a2b42d0 100644
--- a/srcpkgs/menu-cache/template
+++ b/srcpkgs/menu-cache/template
@@ -1,11 +1,11 @@
 # Template file for 'menu-cache'
 pkgname=menu-cache
 version=0.3.2
-revision=5
-subpackages="$pkgname-devel"
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config
+makedepends="libglib-devel"
 short_desc="LXDE freedesktop menu specification"
 homepage="http://lxde.org/"
 license="GPL-2"
@@ -23,3 +23,18 @@ long_desc="
    are done by menu-cache-gen when the menus are really changed.)
  * Less unnecessary and complicated file monitoring.
  * Heavily reduced disk I/O."
+
+menu-cache-devel_package() {
+	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+menu-cache_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index fe86519297d..1c405585279 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -4,7 +4,6 @@ version=2.5.2
 revision=1
 build_style=python-module
 makedepends="python-devel"
-pycompile_module="${pkgname} hgext"
 short_desc="Fast, lightweight source control management system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -18,3 +17,10 @@ post_install() {
 	install -m644 doc/*.1 ${DESTDIR}/usr/share/man/man1
 	install -m644 doc/*.5 ${DESTDIR}/usr/share/man/man5
 }
+
+mercurial_package() {
+	pycompile_module="mercurial hgext"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index aad316151b1..ddf19894378 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -3,8 +3,8 @@ pkgname=mesa-demos
 version=8.1.0
 revision=1
 build_style=gnu-configure
-makedepends="pkg-config libX11-devel libXext-devel MesaLib-devel glu-devel
- glew-devel freetype-devel"
+hostmakedepends="pkg-config"
+makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel"
 short_desc="Mesa 3D demos and tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org"
@@ -17,3 +17,9 @@ long_desc="
  or state machine, it is being used with authorization from Silicon Graphics,
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
+
+mesa-demos_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mex/template b/srcpkgs/mex/template
index 186e2b66e36..bf142f9f454 100644
--- a/srcpkgs/mex/template
+++ b/srcpkgs/mex/template
@@ -2,19 +2,22 @@
 pkgname=mex
 version=0.2.2
 revision=4
-distfiles="http://media-explorer.github.com/releases/mex-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-lirc --enable-networks --disable-displayconf
 --enable-webremote --enable-rebinder --with-online=networkmanager
 --enable-library --enable-recommended --enable-search --enable-queue
 --enable-applications --enable-upnp --enable-tracker --disable-telepathy
 --enable-opticaldisc"
-makedepends="pkg-config intltool grilo-devel mx-devel>=1.3.2 gst-plugins-base-devel telepathy-glib-devel clutter-gst-devel avahi-glib-libs-devel tracker-devel libXtst-devel rest-devel NetworkManager-devel libsoup-gnome-devel dbus-glib-devel"
-fulldepends="hicolor-icon-theme desktop-file-utils"
+hostmakedepends="pkg-config intltool"
+makedepends="grilo-devel mx-devel>=1.3.2 gst-plugins-base-devel telepathy-glib-devel
+ clutter-gst-devel avahi-glib-libs-devel tracker-devel libXtst-devel rest-devel
+ NetworkManager-devel libsoup-gnome-devel dbus-glib-devel
+ hicolor-icon-theme desktop-file-utils"
 short_desc="Media centre application for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
+distfiles="http://media-explorer.github.com/releases/mex-$version.tar.bz2"
 checksum=ea53091ec8d6b6cb4c0b5ae63ac5af4e682ec0a07aa2311046585925d3713d1d
 long_desc="
  It leverages existing libraries (GUPnP, Grilo, Tracker, GStreamer) to find,
@@ -27,12 +30,14 @@ long_desc="
   * Support for media discovery and streaming from UPnP sources.
   * Configurable key binding, enabling use with standard remote control units."
 
-
-
-
-
-
 pre_configure() {
 	sed -i -e "s|tracker-sparql-0.12|tracker-sparql-0.14|g" \
 		-e "s|tracker-miner-0.12|tracker-miner-0.14|g" configure
 }
+
+mex_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template
index 7b0f4b2abb7..e486db0817a 100644
--- a/srcpkgs/mg/template
+++ b/srcpkgs/mg/template
@@ -1,13 +1,13 @@
 # Template file for 'mg'
 pkgname=mg
 version=20110905
+revision=1
 makedepends="ncurses-devel"
 homepage="http://homepage.boetes.org/software/mg"
-distfiles="$homepage/mg-$version.tar.gz"
-revision=1
 short_desc="Micro GNU/emacs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public Domain"
+distfiles="$homepage/mg-$version.tar.gz"
 checksum=1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229
 long_desc="
  mg is Micro GNU/emacs, this is a portable version of the mg maintained
@@ -21,3 +21,9 @@ do_install() {
 	vinstall mg 755 usr/bin
 	vinstall mg.1 644 usr/share/man/man1
 }
+
+mg_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index cbe01c89d08..b1bbeac29ae 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -3,8 +3,6 @@ pkgname=midori
 version=0.4.9
 revision=1
 build_style=waf
-conf_files="/etc/xdg/midori/search"
-depends="hicolor-icon-theme desktop-file-utils"
 makedepends="pkg-config intltool python>=0 gtk+-devel libxml2-devel
  dbus-glib-devel librsvg-devel libnotify-devel libsoup-devel
  webkit-gtk-devel sqlite-devel libXScrnSaver-devel
@@ -25,3 +23,12 @@ long_desc="
   * Custom context menu actions
   * User scripts and user styles support
   * Extensible via Javascript"
+
+midori_package() {
+	conf_files="/etc/xdg/midori/search"
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/minecraft/template b/srcpkgs/minecraft/template
index fc37389a52b..93cb53139f5 100644
--- a/srcpkgs/minecraft/template
+++ b/srcpkgs/minecraft/template
@@ -16,12 +16,18 @@ over a blocky ocean. I's pretty. Brave players battle terrible things
 in The Nether, which is more scary than pretty. You can also visit a
 land of mushrooms if it sounds more like your cup of tea."
 
-noarch=yes
 nofetch=yes
 noextract=yes
-nonfree=yes
-depends="wmname wget"
 
 do_install() {
 	vinstall ${FILESDIR}/minecraft 755 usr/bin
 }
+
+minecraft_package() {
+	nonfree="yes"
+	noarch="yes"
+	depends="wmname wget"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template
index 56b1c15ac5b..4e5819bdfe6 100644
--- a/srcpkgs/mingw-w64-binutils/template
+++ b/srcpkgs/mingw-w64-binutils/template
@@ -3,8 +3,7 @@ pkgname=mingw-w64-binutils
 version=2.21.1
 revision=3
 distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2"
-depends="glibc zlib"
-makedepends="flex"
+hostmakedepends="flex"
 short_desc="GNU binary utilities (mingw-w64 version)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.gnu.org/software/binutils/"
@@ -25,14 +24,11 @@ long_desc="
 
  * This is a special version for mingw-w64."
 
-
-
 wrksrc=binutils-$version
 
 _mingwprefix=/opt
 
-do_build()
-{
+do_build() {
 	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 		_mingwtriplet="${XBPS_MACHINE}-w64-mingw32"
 		_target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32"
@@ -52,8 +48,7 @@ do_build()
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	make DESTDIR=${DESTDIR} install
 
 	# Remove useless manpages
@@ -78,3 +73,9 @@ do_install()
 	# The mingw-w64 faq advises to create a symlink here
 	cd ${DESTDIR}/${_mingwprefix} && ln -sf ${_mingwtriplet} mingw
 }
+
+mingw-w64-binutils_package() {
+	pkg_install() {
+		vmove opt
+	}
+}
diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template
index 7dab169eccb..ce33b65a2b8 100644
--- a/srcpkgs/mingw-w64-crt/template
+++ b/srcpkgs/mingw-w64-crt/template
@@ -7,11 +7,11 @@ _snapshot=20110523
 version=${_majversion}.${_snapshot}
 revision=3
 distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2
-makedepends="flex"
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	makedepends="${makedepends} gcc-multilib"
+hostmakedepends="flex"
+makedepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc"
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	makedepends+=" gcc-multilib"
 fi
-fulldepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc"
 short_desc="The mingw-w64 cross-compiler runtime"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -62,3 +62,9 @@ do_install() {
 
 	export PATH=$SAVEDPATH
 }
+
+mingw-w64-crt_package() {
+	pkg_install() {
+		vmove opt
+	}
+}
diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template
index c1ced409264..7e1c9f1c269 100644
--- a/srcpkgs/mingw-w64-gcc/template
+++ b/srcpkgs/mingw-w64-gcc/template
@@ -5,11 +5,11 @@ _majorver=4.6
 version=${_majorver}.1
 revision=6
 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
-makedepends="flex"
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	makedepends="${makedepends} gcc-multilib"
+hostmakedepends="flex"
+makedepends="mingw-w64-binutils mingw-w64-headers"
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	makedepends+=" gcc-multilib"
 fi
-fulldepends="mingw-w64-binutils mingw-w64-headers"
 short_desc="The GNU C Compiler (for mingw-w64)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -70,3 +70,9 @@ do_install() {
 	# Remove useless manpages
 	rm -rf ${DESTDIR}/${_mingwprefix}/share
 }
+
+mingw-w64-gcc_package() {
+	pkg_install() {
+		vmove opt
+	}
+}
diff --git a/srcpkgs/mingw-w64-headers/template b/srcpkgs/mingw-w64-headers/template
index 5d855459e64..f0e7d9cabf3 100644
--- a/srcpkgs/mingw-w64-headers/template
+++ b/srcpkgs/mingw-w64-headers/template
@@ -30,3 +30,10 @@ pre_install() {
 	vmkdir usr/${_mingwtriplet}/usr/include
 	ln -sfr ${DESTDIR}/usr/${_mingwtriplet}/usr/include ${DESTDIR}/usr/${_mingwtriplet}/include
 }
+
+mingw-w64-headers_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template
index ada8fac298f..1b166156a19 100644
--- a/srcpkgs/mingw-w64-libgcc/template
+++ b/srcpkgs/mingw-w64-libgcc/template
@@ -5,12 +5,11 @@ _majorver=4.6
 version=${_majorver}.1
 revision=2
 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
-depends="glibc cloog-ppl ppl gmp mpc mpfr zlib"
-makedepends="flex"
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	makedepends="${makedepends} gcc-multilib"
+hostmakedepends="flex"
+makedepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc mingw-w64-crt"
+if [ "$XBPS_MACHINE" = "x86_64" ]; then
+	makedepends+=" gcc-multilib"
 fi
-fulldepends="mingw-w64-binutils mingw-w64-headers mingw-w64-gcc mingw-w64-crt"
 short_desc="The GNU C Compiler (libs for mingw-w64)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://mingw-w64.sourceforge.net/"
@@ -88,3 +87,9 @@ do_install() {
 	# Remove useless manpages
 	rm -rf ${DESTDIR}/${_mingwprefix}/share
 }
+
+mingw-w64-libgcc_package() {
+	pkg_install() {
+		vmove opt
+	}
+}
diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template
index 79999ce66c6..51b87808907 100644
--- a/srcpkgs/minicom/template
+++ b/srcpkgs/minicom/template
@@ -13,3 +13,9 @@ checksum=a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56
 long_desc="
  Minicom is a menu driven communications program. It emulates ANSI and VT102
  terminals. It has a dialing directory and auto zmodem download."
+
+minicom_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/miniupnpc/miniupnpc-devel.template b/srcpkgs/miniupnpc/miniupnpc-devel.template
deleted file mode 100644
index d95f22b64f4..00000000000
--- a/srcpkgs/miniupnpc/miniupnpc-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'miniupnpc-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template
index a44bd145443..2b8e5ac57f3 100644
--- a/srcpkgs/miniupnpc/template
+++ b/srcpkgs/miniupnpc/template
@@ -3,8 +3,6 @@ pkgname=miniupnpc
 version=1.6
 revision=2
 build_style=gnu-makefile
-subpackages="$pkgname-devel"
-make_install_args="PREFIX=${XBPS_DESTDIR}/${pkgname}-${version}"
 short_desc="A small UPnP client library/tool to access Internet Gateway Devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://miniupnp.free.fr"
@@ -21,8 +19,25 @@ long_desc="
  (which may encode infinite graphs), dependence analysis and bounds on piecewise
  step-polynomials."
 
-post_install() {
+do_install() {
+	make PREFIX=${DESTDIR} install
+
 	chmod 755 ${DESTDIR}/usr/lib/*.so*
 	vinstall man3/miniupnpc.3 644 usr/share/man/man3
 	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }
+
+miniupnpc-devel_package() {
+	depends="${sourcepkg}>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+miniupnpc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mkfontdir/template b/srcpkgs/mkfontdir/template
index ac507f1f68e..21a98fb3fec 100644
--- a/srcpkgs/mkfontdir/template
+++ b/srcpkgs/mkfontdir/template
@@ -1,18 +1,24 @@
 # Template build file for 'mkfontdir'.
 pkgname=mkfontdir
 version=1.0.7
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-noarch=yes
-fulldepends="mkfontscale"
 revision=1
+build_style=gnu-configure
+makedepends="mkfontscale"
 short_desc="X11 Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530
 long_desc="
  The mkfontdir tool uses mkfontscale to create an index of X font
  files (such as PCF, SNF, or BDF) in a directory.  The X server
  and font server use the generated "fonts.dir" file to find font files."
 
+mkfontdir_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index 88ab4ca8c13..16ec4e5cc28 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -15,3 +15,9 @@ checksum=ce55f862679b8ec127d7f7315ac04a8d64a0d90a0309a70dc56c1ba3f9806994
 long_desc="
  This package contains the mkfontscale, a program to generate legacy X11
  font indices for scalable fonts. This is from the modular X.org project."
+
+mkfontscale_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index ad23b8a26ea..58cbcc5362a 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -2,7 +2,6 @@
 pkgname=mksh
 version=R44
 revision=3
-register_shell="/bin/mksh"
 short_desc="The Mir Korn SHell"
 maintainer="pancake <xtraeme@gmail.com>"
 homepage="https://www.mirbsd.org/mksh.htm"
@@ -19,3 +18,10 @@ do_install() {
 	vinstall ${wrksrc}/mksh 755 usr/bin
 	vinstall ${wrksrc}/mksh.1 644 usr/share/man/man1
 }
+
+mksh_package() {
+	register_shell="/bin/mksh"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 1bc8e4db7c1..10b9cd28da0 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -2,7 +2,6 @@
 pkgname=mobile-broadband-provider-info
 version=20120614
 revision=1
-noarch=yes
 build_style=gnu-configure
 short_desc="Database of mobile broadband service providers"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,3 +14,10 @@ long_desc="
  broadband providers in different countries. Its functioning through Network
  Manager makes it easy for users to choose their mobile broadband service
  provider."
+
+mobile-broadband-provider-info_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template
index 6cb32edbd88..0a420ab4a70 100644
--- a/srcpkgs/mod_wsgi/template
+++ b/srcpkgs/mod_wsgi/template
@@ -2,13 +2,13 @@
 pkgname=mod_wsgi
 version=3.4
 revision=1
-distfiles="http://modwsgi.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 makedepends="apache-devel python-devel"
 short_desc="Python WSGI adapter module for Apache"
 homepage="https://code.google.com/p/modwsgi/"
 license="APL-2.0"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://modwsgi.googlecode.com/files/$pkgname-$version.tar.gz"
 checksum=ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8
 long_desc="
  The aim of mod_wsgi is to implement a simple to use Apache module which can
@@ -17,3 +17,8 @@ long_desc="
  sites, as well as your average self managed personal sites running on web
  hosting services."
 
+mod_wsgi_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mongoose/libmongoose.template b/srcpkgs/mongoose/libmongoose.template
deleted file mode 100644
index 47c6008bdc1..00000000000
--- a/srcpkgs/mongoose/libmongoose.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libmongoose.
-#
-short_desc="${short_desc} -- shared library"
-long_desc="${long_desc}
-
- This package contains the shared library."
-
-do_install() {
-	vmove usr/lib usr
-}
diff --git a/srcpkgs/mongoose/mongoose-devel.template b/srcpkgs/mongoose/mongoose-devel.template
deleted file mode 100644
index 8b86bc44a9e..00000000000
--- a/srcpkgs/mongoose/mongoose-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'mongoose-devel'.
-#
-noarch=yes
-depends="glibc-devel libmongoose>=$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
-}
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index ee97ad7c7ae..03e7ef4cc5b 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,12 +1,11 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=3.1
-revision=2
+revision=3
 wrksrc=$pkgname
 build_style=gnu-makefile
 make_build_args="linux"
 make_install_args="PREFIX=/usr MANDIR=share/man"
-subpackages="$pkgname-devel lib$pkgname"
 short_desc="An Easy to use Web server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -16,3 +15,24 @@ checksum=fd003ff722d8b654a6ceaaadeffb1806d2d513afe888ba00ecfb4a115897844c
 long_desc="
  Mongoose is easy to use web server. It also can be used as embedded web server
  library to provide web interface to applications."
+
+mongoose-devel_package() {
+	depends="libmongoose>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+libmongoose_package() {
+	short_desc="${short_desc} -- shared library"
+	pkg_install() {
+		vmove usr/lib
+	}
+}
+
+mongoose_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index aa0f88c3813..626875f413b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -3,9 +3,8 @@ pkgname=mosh
 version=1.2.3
 revision=1
 build_style=gnu-configure
-makedepends="pkg-config ncurses-devel protobuf-devel libutempter-devel
- openssl-devel"
-fulldepends="perl-IO-Tty"
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel perl-IO-Tty"
 short_desc="MObile SHell"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -18,3 +17,10 @@ long_desc="
 
  Mosh is a replacement for SSH. It's more robust and responsive, especially over
  Wi-Fi, cellular, and long-distance links."
+
+mosh_package() {
+	depends="perl-IO-Tty"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index ba0afc699e6..1a09869e657 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -3,7 +3,6 @@ pkgname=mousepad
 version=0.3.0
 revision=1
 build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
 makedepends="pkg-config intltool gtk+-devel libxfce4util-devel
  libxfcegui4-devel gtksourceview2-devel dbus-glib-devel"
 short_desc="Simple text editor for Xfce based on Leafpad"
@@ -12,3 +11,10 @@ license="GPL-2"
 homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/apps/${pkgname}/0.3/${pkgname}-${version}.tar.bz2"
 checksum=10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d
+
+mousepad_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mpg123/libmpg123.template b/srcpkgs/mpg123/libmpg123.template
deleted file mode 100644
index 709bc4343ad..00000000000
--- a/srcpkgs/mpg123/libmpg123.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'libmpg123'.
-#
-short_desc="${short_desc} - Runtime library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove usr/lib/mpg123/output_dummy.so usr/lib/mpg123
-	vmove usr/lib/mpg123/output_oss.so usr/lib/mpg123
-}
diff --git a/srcpkgs/mpg123/mpg123-alsa.template b/srcpkgs/mpg123/mpg123-alsa.template
deleted file mode 100644
index e2ed0055a76..00000000000
--- a/srcpkgs/mpg123/mpg123-alsa.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mpg123-alsa'.
-#
-depends="libmpg123>=${version}"
-short_desc="${short_desc} - ALSA output plugin"
-replaces="libmpg123<1.13.4_1"
-
-do_install() {
-        vmove usr/lib/mpg123/output_alsa.so usr/lib/mpg123
-}
diff --git a/srcpkgs/mpg123/mpg123-devel.template b/srcpkgs/mpg123/mpg123-devel.template
deleted file mode 100644
index 632f8904888..00000000000
--- a/srcpkgs/mpg123/mpg123-devel.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mpg123-devel'.
-#
-depends="libmpg123>=${version}"
-short_desc="${short_desc} - Development files"
-
-do_install() {
-        vmove usr/include usr
-        vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/mpg123/mpg123-jack.template b/srcpkgs/mpg123/mpg123-jack.template
deleted file mode 100644
index 37256a4a309..00000000000
--- a/srcpkgs/mpg123/mpg123-jack.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mpg123-jack'.
-#
-depends="libmpg123>=${version}"
-short_desc="${short_desc} - JACK output plugin"
-replaces="libmpg123<1.13.4_1"
-
-do_install() {
-        vmove usr/lib/mpg123/output_jack.so usr/lib/mpg123
-}
diff --git a/srcpkgs/mpg123/mpg123-pulseaudio.template b/srcpkgs/mpg123/mpg123-pulseaudio.template
deleted file mode 100644
index 30755b793b6..00000000000
--- a/srcpkgs/mpg123/mpg123-pulseaudio.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mpg123-pulseaudio'.
-#
-depends="libmpg123>=${version}"
-short_desc="${short_desc} - Pulseaudio output plugin"
-replaces="libmpg123<1.13.4_1"
-
-do_install() {
-        vmove usr/lib/mpg123/output_pulse.so usr/lib/mpg123
-}
diff --git a/srcpkgs/mpg123/mpg123-sdl.template b/srcpkgs/mpg123/mpg123-sdl.template
deleted file mode 100644
index d316d83a4ff..00000000000
--- a/srcpkgs/mpg123/mpg123-sdl.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'mpg123-sdl'.
-#
-depends="libmpg123>=${version}"
-short_desc="${short_desc} - SDL output plugin"
-replaces="libmpg123<1.13.4_1"
-
-do_install() {
-        vmove usr/lib/mpg123/output_sdl.so usr/lib/mpg123
-}
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 3d0ca4f1605..58b4cd0e263 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -2,11 +2,9 @@
 pkgname=mpg123
 version=1.14.4
 revision=2
-subpackages="mpg123-alsa libmpg123 mpg123-devel"
 build_style=gnu-configure
 configure_args="--with-module-suffix=.so --with-optimization=4
---with-default-audio=alsa --enable-ipv6=yes --enable-network=yes"
-depends="mpg123-alsa>=1.14.1"
+ --with-default-audio=alsa --enable-ipv6=yes --enable-network=yes"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libltdl-devel"
 short_desc="Fast console mpeg audio decoder/player"
@@ -20,3 +18,88 @@ long_desc="
  3 decoding library and console player. It uses floating point or integer
  math, along with several special optimizations (3DNow, SSE, ARM, ...) to make
  it most efficient."
+
+# Package build options
+build_options="jack pulseaudio sdl"
+
+desc_option_jack="Enable building the JACK module"
+desc_option_pulseaudio="Enable building the Pulseaudio module"
+desc_option_sdl="Enable building the SDL module"
+
+build_options_default="${build_options}"
+
+if [ "$build_option_jack" ]; then
+	makedepends+=" jack-devel"
+
+	mpg123-jack_package() {
+		depends="libmpg123>=${version}"
+		short_desc="${short_desc} - JACK output plugin"
+		replaces="libmpg123<1.13.4_1"
+		do_install() {
+        		vmove usr/lib/mpg123/output_jack.so
+		}
+	}
+
+fi
+
+if [ "$build_option_pulseaudio" ]; then
+	makedepends+=" pulseaudio-devel"
+
+	mpg123-pulseaudio_package() {
+		depends="libmpg123>=${version}"
+		short_desc="${short_desc} - Pulseaudio output plugin"
+		replaces="libmpg123<1.13.4_1"
+		do_install() {
+        		vmove usr/lib/mpg123/output_pulse.so
+		}
+	}
+
+fi
+
+if [ "$build_option_sdl" ]; then
+	makedepends+=" SDL-devel"
+
+	mpg123-sdl_package() {
+		depends="libmpg123>=${version}"
+		short_desc="${short_desc} - SDL output plugin"
+		replaces="libmpg123<1.13.4_1"
+		do_install() {
+        		vmove usr/lib/mpg123/output_sdl.so
+		}
+	}
+
+fi
+
+mpg123-alsa_package() {
+	depends="libmpg123>=${version}"
+	short_desc="${short_desc} - ALSA output plugin"
+	replaces="libmpg123<1.13.4_1"
+	pkg_install() {
+        	vmove usr/lib/mpg123/output_alsa.so
+	}
+}
+
+libmpg123_package() {
+	short_desc="${short_desc} - Runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove usr/lib/mpg123/output_dummy.so
+		vmove usr/lib/mpg123/output_oss.so
+	}
+}
+
+mpg123-devel_package() {
+	depends="libmpg123>=${version}"
+	short_desc="${short_desc} - Development files"
+	pkg_install() {
+        	vmove usr/include
+        	vmove usr/lib/pkgconfig
+	}
+}
+
+mpg123_package() {
+	depends="mpg123-alsa>=${version}"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mpg123/template.options b/srcpkgs/mpg123/template.options
deleted file mode 100644
index 62797d09d03..00000000000
--- a/srcpkgs/mpg123/template.options
+++ /dev/null
@@ -1,25 +0,0 @@
-# Package build options
-build_options="jack pulseaudio sdl"
-
-desc_option_jack="Enable building the JACK module"
-desc_option_pulseaudio="Enable building the Pulseaudio module"
-desc_option_sdl="Enable building the SDL module"
-
-build_options_default="${build_options}"
-
-do_options() {
-	if [ "$build_option_jack" ]; then
-		makedepends="${makedepends} jack-devel"
-		subpackages="${subpackages} ${sourcepkg}-jack"
-	fi
-
-	if [ "$build_option_pulseaudio" ]; then
-		makedepends="${makedepends} pulseaudio-devel"
-		subpackages="${subpackages} ${sourcepkg}-pulseaudio"
-	fi
-
-	if [ "$build_option_sdl" ]; then
-		makedepends="${makedepends} SDL-devel"
-		subpackages="${subpackages} ${sourcepkg}-sdl"
-	fi
-}
diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 6fd939d4587..7bf2afb9aca 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -36,15 +36,10 @@ makedepends="pkg-config videoproto libudev-devel>=183 libpng-devel>=1.5.10
  sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel
  libmodplug-devel libva-devel v4l-utils-devel yasm"
 
-conf_files="
-/etc/mplayer/input.conf
-/etc/mplayer/codecs.conf"
-
 pre_configure() {
 	if [ "$XBPS_MACHINE" = "i686" ]; then
 		sed 's|-march=i486||g' -i config.mak
 	fi
-	:
 }
 
 post_install() {
@@ -60,3 +55,13 @@ post_install() {
 	vinstall etc/mplayer256x256.png 644 usr/share/pixmaps mplayer.png
 }
 
+
+mplayer_package() {
+	conf_files="
+		/etc/mplayer/input.conf
+		/etc/mplayer/codecs.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 8f2f81e35fa..f83af6e6f18 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -27,3 +27,9 @@ long_desc="
  - IPv6 support.
  - LMTP support.
  - Support for multiple accounts."
+
+msmtp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index 3c49b31d1e8..c2fb4622e8d 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -29,3 +29,9 @@ do_install() {
 		make DESTDIR=${DESTDIR} install
 	fi
 }
+
+mtd-utils_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mtdev/mtdev-devel.template b/srcpkgs/mtdev/mtdev-devel.template
deleted file mode 100644
index a9eab91a129..00000000000
--- a/srcpkgs/mtdev/mtdev-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'mtdev-devel'.
-#
-depends="mtdev"
-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/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/mtdev/template b/srcpkgs/mtdev/template
index 5dc03a694e5..228a5850c10 100644
--- a/srcpkgs/mtdev/template
+++ b/srcpkgs/mtdev/template
@@ -1,13 +1,13 @@
 # Template build file for 'mtdev'.
 pkgname=mtdev
 version=1.1.2
-distfiles="http://bitmath.org/code/mtdev/mtdev-${version}.tar.bz2"
+revision=2
 build_style=gnu-configure
-revision=1
 short_desc="Multitouch Protocol Translation Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://bitmath.org/code/mtdev/"
 license="MIT"
+distfiles="http://bitmath.org/code/mtdev/mtdev-${version}.tar.bz2"
 checksum=698dd11ca08b3a73ad33d8a5076f6d9e018d97afad3eba36f540b8ea7b775a30
 long_desc="
  The mtdev is a stand-alone library which transforms all variants of kernel MT
@@ -19,4 +19,18 @@ long_desc="
  Multitouch X Driver. With this package, finger tracking and seamless MT
  protocol handling is available under a free license." 
 
-subpackages="mtdev-devel"
+mtdev-devel_package() {
+	depends="mtdev>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+mtdev_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index c96443ca021..b3e932538ac 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -4,7 +4,6 @@ version=4.0.17
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel"
-conf_files="/etc/mtools.conf"
 short_desc="A collection of utilities to access MS-DOS disks"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -21,3 +20,11 @@ long_desc="
 post_install() {
 	vinstall mtools.conf 644 etc
 }
+
+mtools_package() {
+	conf_files="/etc/mtools.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/muffin/libmuffin-devel.template b/srcpkgs/muffin/libmuffin-devel.template
deleted file mode 100644
index dd817bc3c6d..00000000000
--- a/srcpkgs/muffin/libmuffin-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libmuffin-devel'.
-#
-depends="libmuffin-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/muffin/*.gir" usr/lib/muffin
-}
diff --git a/srcpkgs/muffin/libmuffin.template b/srcpkgs/muffin/libmuffin.template
deleted file mode 100644
index a8e570a457e..00000000000
--- a/srcpkgs/muffin/libmuffin.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'libmuffin'.
-#
-short_desc="${short_desc} -- runtime library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-	vmove "usr/lib/muffin/*.typelib" usr/lib/muffin
-}
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index e9aaf9072fe..7681bca2feb 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -2,7 +2,6 @@
 pkgname=muffin
 version=1.1.2
 revision=2
-subpackages="libmuffin libmuffin-devel"
 hostmakedepends="automake gettext-devel pkg-config intltool
  gnome-doc-utils gobject-introspection"
 makedepends="clutter-devel>=1.14 GConf-devel libcanberra-devel libXxf86vm-devel
@@ -39,3 +38,27 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+libmuffin_package() {
+	short_desc="${short_desc} -- runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+		vmove "usr/lib/muffin/*.typelib"
+	}
+}
+
+libmuffin-devel_package() {
+	depends="libmuffin-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/muffin/*.gir"
+	}
+}
+
+muffin_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mumble/murmur.template b/srcpkgs/mumble/murmur.template
deleted file mode 100644
index c277f38c938..00000000000
--- a/srcpkgs/mumble/murmur.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'murmur'.
-#
-depends="mumble qt-plugin-sqlite"
-short_desc="${short_desc} - The murmur server (for mumble)"
-long_desc="${long_desc}
-
- This package contains the Murmur server (for mumble)"
-
-
-
-do_install()
-{
-	vmkdir usr/bin
-	vmkdir usr/share/man/man1
-	cp ${wrksrc}/release/murmurd ${DESTDIR}/usr/bin
-	cp ${wrksrc}/man/murmur{d,-user-wrapper}.1 ${DESTDIR}/usr/share/man/man1
-}
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index ada82c8b866..8fa1eb743f1 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -2,14 +2,14 @@
 pkgname=mumble
 version=1.2.3
 revision=8
-homepage="http://mumble.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-depends="qt-plugin-sqlite"
-makedepends="libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel openssl-devel speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
-fulldepends="desktop-file-utils hicolor-icon-theme"
+makedepends="libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel openssl-devel
+ speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
+ avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="http://mumble.sourceforge.net/"
 license="BSD"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
 long_desc="
  Mumble is a voice chat application for groups. While it can be used for any
@@ -19,15 +19,8 @@ long_desc="
  or about Mumble and Murmur the whole voice chat application suite."
 
 disable_parallel_build=yes
-subpackages="murmur"
-replaces="libmumble<=1.2.3"
 
-
-
-
-
-do_configure()
-{
+do_configure() {
 	# Needs bundled celt for some reason
 	qmake -recursive main.pro \
 		CONFIG+="no-speechd bundled-celt no-bundled-speex no-g15 \
@@ -35,13 +28,11 @@ do_configure()
 		DEFINES+="PLUGIN_PATH=/usr/lib/mumble"
 }
 
-do_build()
-{
+do_build() {
 	make ${makejobs} release
 }
 
-do_install()
-{
+do_install() {
 	vmkdir usr/bin
 	vmkdir usr/lib/mumble
 	vmkdir usr/share/applications
@@ -56,4 +47,26 @@ do_install()
 	cp ${wrksrc}/scripts/mumble.desktop ${DESTDIR}/usr/share/applications
 	cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1
 	cp ${wrksrc}/icons/mumble.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
+
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+	cp ${wrksrc}/release/murmurd ${DESTDIR}/usr/bin
+	cp ${wrksrc}/man/murmur{d,-user-wrapper}.1 ${DESTDIR}/usr/share/man/man1
+}
+
+murmur_package() {
+	depends="mumble>=${version}"
+	short_desc="${short_desc} - The murmur server (for mumble)"
+	pkg_install() {
+		vmove usr/bin/murmurd
+		vmove "usr/share/man/man1/mumurd*.1"
+	}
+}
+
+mumble_package() {
+	replaces="libmumble<=1.2.3"
+	depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
 }
diff --git a/srcpkgs/mumble122/template b/srcpkgs/mumble122/template
index ebeb6f16b5b..f1256f6de3b 100644
--- a/srcpkgs/mumble122/template
+++ b/srcpkgs/mumble122/template
@@ -1,17 +1,15 @@
 # Template file for 'mumble122'
-__pkgname=mumble
-pkgname=${__pkgname}122
+pkgname=mumble122
 version=1.2.2
 revision=4
-depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
 makedepends="protobuf-devel libXi-devel qt-devel openssl-devel speex-devel
-jack-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
-avahi-compat-libs-devel MesaLib-devel libogg-devel boost-devel"
+ jack-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
+ avahi-compat-libs-devel MesaLib-devel libogg-devel boost-devel"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
-homepage="http://${__pkgname}.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${__pkgname}/${__pkgname}-${version}.tar.gz"
+homepage="http://mumble.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/mumble/mumble-${version}.tar.gz"
 checksum=2c564e3d5b7481129482f2365375a2dc77e134c0c00012073cfdfbeadaa49be8
 long_desc="
  Mumble is a voice chat application for groups. While it can be used for any
@@ -24,10 +22,8 @@ long_desc="
  Filipe Coelho (falkTX) of KXStudio."
 
 disable_parallel_build=yes
-replaces="lib${__pkgname}<=1.2.3 ${__pkgname}>=0"
-provides="${__pkgname}-999"
 
-wrksrc=${__pkgname}-${version}
+wrksrc=mumble-${version}
 
 do_configure() {
 	# Needs bundled celt for some reason
@@ -58,3 +54,12 @@ do_install() {
 	cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1
 	cp ${wrksrc}/icons/mumble.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
 }
+
+mumble122_package() {
+	replaces="libmumble<=1.2.3 mumble>=0"
+	provides="mumble-999"
+	depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1ece95eab6e..f57597182f8 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -21,3 +21,9 @@ post_install() {
 	vmkdir usr/bin
 	ln -sfr ${DESTDIR}/usr/lib/musl/bin/musl-gcc ${DESTDIR}/usr/bin/musl-gcc
 }
+
+musl-bootstrap_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index fe45e5f5845..175ea3296df 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -15,8 +15,13 @@ long_desc="
  musl is lightweight, fast, simple, free, and strives to be correct in the
  sense of standards-conformance and safety."
 
-conflicts="glibc>=0"
-
 post_install() {
 	vmove "lib/*" usr/lib
 }
+
+musl_package() {
+	conflicts="glibc>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template
index e325949bd2e..38e804790a6 100644
--- a/srcpkgs/mutagen/template
+++ b/srcpkgs/mutagen/template
@@ -1,14 +1,14 @@
 # Template file for 'mutagen'
 pkgname=mutagen
 version=1.20
+revision=1
+build_style=python-module
+makedepends="python"
+short_desc="Python multimedia tagging library"
+maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://code.google.com/p/${pkgname}/"
 license="GPL-2"
 distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
-build_style=python-module
-fulldepends="python"
-revision=1
-short_desc="Python multimedia tagging library"
-maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=7e56c478de154fdcd00d257ebc77be8718188f1a0db916f51f129b7ca01de6e7
 long_desc="
  Mutagen is a Python module to handle audio metadata. It supports ASF, FLAC,
@@ -19,6 +19,11 @@ long_desc="
  tags can be edited regardless of audio format. It can also manipulate Ogg
  streams on an individual packet/page level."
 
-pycompile_module="mutagen"
-noarch=yes
-
+mutagen_package() {
+	depends="python"
+	noarch="yes"
+	pycompile_module="mutagen"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mutter/mutter-devel.template b/srcpkgs/mutter/mutter-devel.template
deleted file mode 100644
index 61e15899fbc..00000000000
--- a/srcpkgs/mutter/mutter-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'mutter-devel'.
-#
-depends="gsettings-desktop-schemas>=3.8.0 gtk+3-devel>=3.8
- clutter-devel>=1.14 libX11-devel mutter-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/mutter/*.gir" usr/share/gir-1.0
-}
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 7d4aa09c36d..312c1b83b5e 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -7,11 +7,29 @@ build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
 hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
 makedepends="gtk+3-devel>=3.8 startup-notification-devel libcanberra-devel
- clutter-devel>=1.14 gsettings-desktop-schemas-devel>=3.8"
-fulldepends="zenity>=3.8.0 desktop-file-utils"
+ clutter-devel>=1.14 gsettings-desktop-schemas-devel>=3.8
+ zenity>=3.8.0 desktop-file-utils"
 short_desc="Lightweight GTK+3 window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
 checksum=93ab8b7fac58582d9178766118046c4255a7f2f302c74391d7f9f32fde57aa1a
+
+mutter-devel_package() {
+	depends="gsettings-desktop-schemas>=3.8.0 gtk+3-devel>=3.8
+		clutter-devel>=1.14 libX11-devel mutter-${version}_${revision}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/mutter/*.gir"
+	}
+}
+
+mutter_package() {
+	depends="zenity>=3.8.0 desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mx/mx-devel.template b/srcpkgs/mx/mx-devel.template
deleted file mode 100644
index 9bb08399509..00000000000
--- a/srcpkgs/mx/mx-devel.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'mx-devel'.
-#
-noarch=yes
-depends="gtk+-devel clutter-devel mx>=$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/gir-1.0 usr/share
-	vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/mx/template b/srcpkgs/mx/template
index f66fecde3a5..748711170d7 100644
--- a/srcpkgs/mx/template
+++ b/srcpkgs/mx/template
@@ -1,10 +1,10 @@
 # Template file for 'mx'
 pkgname=mx
 version=1.4.6
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="mx-devel"
-makedepends="pkg-config intltool gobject-introspection libXrandr-devel gtk+-devel dbus-glib-devel clutter-devel startup-notification-devel"
+hostmakedepends="pkg-config intltool gobject-introspection"
+makedepends="libXrandr-devel gtk+-devel dbus-glib-devel clutter-devel startup-notification-devel"
 short_desc="A widget toolkit using Clutter"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.clutter-project.org"
@@ -16,3 +16,20 @@ long_desc="
  rich and animated graphical user interfaces.
 
  This package provides mx, a widget toolkit that uses Clutter."
+
+mx-devel_package() {
+	depends="gtk+-devel clutter-devel mx>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		vmove usr/share/gtk-doc
+	}
+}
+
+mx_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mysql/libmysqlclient-devel.template b/srcpkgs/mysql/libmysqlclient-devel.template
deleted file mode 100644
index 639657ee89e..00000000000
--- a/srcpkgs/mysql/libmysqlclient-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'libmysqlclient-devel'.
-#
-depends="libmysqlclient>=${version}_${revision}"
-short_desc="MySQL database development files"
-long_desc="${long_desc}
-
- This package includes development libraries and header files."
-
-do_install() {
-	vmove usr/bin/mysql_config usr/bin
-	vmove usr/share/man/man1/mysql_config.1 usr/share/man/man1
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/mysql/libmysqlclient.template b/srcpkgs/mysql/libmysqlclient.template
deleted file mode 100644
index c57c9c58c27..00000000000
--- a/srcpkgs/mysql/libmysqlclient.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libmysqlclient'.
-#
-short_desc="MySQL database client library"
-long_desc="${long_desc}
-
- This package includes the client library."
-
-do_install() {
-	vmove "usr/lib/libmysqlclient*.so*" usr/lib
-}
diff --git a/srcpkgs/mysql/mysql-client.template b/srcpkgs/mysql/mysql-client.template
deleted file mode 100644
index 7823df93c77..00000000000
--- a/srcpkgs/mysql/mysql-client.template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'mysql-client'.
-#
-depends="perl"
-short_desc="MySQL database client binaries"
-long_desc="${long_desc}
-
- This package includes the client binaries and the additional tools
- innotop and mysqlreport."
-
-do_install() {
-	for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
-		mysql_client_test_embedded mysqldumpslow mysqlbinlog \
-		mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
-		mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
-		mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
-		mysqlslap mysqltest_embedded mysqlmanager mysqltest \
-		mysqlhotcopy mysql_upgrade mysql_zap; do
-		if [ -f ${SRCPKGDESTDIR}/usr/bin/${f} ]; then
-			vmove usr/bin/${f} usr/bin
-		elif [ -f ${SRCPKGDESTDIR}/usr/sbin/${f} ]; then
-			vmove usr/sbin/${f} usr/sbin
-		fi
-		if [ -f ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 ]; then
-			vmove usr/share/man/man1/${f}.1 usr/share/man/man1
-		elif [ -f ${SRCPKGDESTDIR}/usr/share/man/man8/${f}.8 ]; then
-			vmove usr/share/man/man8/${f}.8 usr/share/man/man8
-		fi
-	done
-}
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index 68ab4621151..853f99ff37b 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -2,8 +2,8 @@
 pkgname=mysql
 version=5.5.27
 revision=2
-depends="mysql-client"
-makedepends="perl cmake bison zlib-devel ncurses-devel openssl-devel readline-devel"
+hostmakedepends="perl cmake bison"
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel"
 short_desc="The world's most popular open source database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.mysql.com/products/community/"
@@ -19,12 +19,6 @@ long_desc="
  the major problems associated with downtime, maintenance and administration
  for modern, online applications."
 
-subpackages="libmysqlclient libmysqlclient-devel mysql-client"
-conf_files="/etc/mysql/my.cnf"
-systemd_services="mysqld.service on"
-system_accounts="mysql"
-mysqld_homedir="/var/lib/mysql"
-
 do_configure() {
 	mkdir build
 	cd build
@@ -86,3 +80,58 @@ do_install() {
 	vinstall ${FILESDIR}/mysqld-post 755 usr/lib/systemd/scripts
 	vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf
 }
+
+libmysqlclient_package() {
+	short_desc="MySQL database client library"
+	pkg_install() {
+		vmove "usr/lib/libmysqlclient*.so*"
+	}
+}
+
+libmysqlclient-devel_package() {
+	depends="libmysqlclient>=${version}_${revision}"
+	short_desc="MySQL database development files"
+	pkg_install() {
+		vmove usr/bin/mysql_config
+		vmove usr/share/man/man1/mysql_config.1
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}
+
+mysql-client_package() {
+	depends="perl"
+	short_desc="MySQL database client binaries"
+	pkg_install() {
+		for f in innochecksum innotop myisam_ftdump mysql mysql_client_test \
+			mysql_client_test_embedded mysqldumpslow mysqlbinlog \
+			mysql_find_rows mysql_fix_extensions mysql_waitpid mysqlaccess \
+			mysqladmin mysqlanalyze mysqlbug mysqlcheck mysqldump \
+			mysqlimport mysqloptimize mysqlrepair mysqlreport mysqlshow \
+			mysqlslap mysqltest_embedded mysqlmanager mysqltest \
+			mysqlhotcopy mysql_upgrade mysql_zap; do
+			if [ -f ${DESTDIR}/usr/bin/${f} ]; then
+				vmove usr/bin/${f}
+			elif [ -f ${DESTDIR}/usr/sbin/${f} ]; then
+				vmove usr/sbin/${f}
+			fi
+			if [ -f ${DESTDIR}/usr/share/man/man1/${f}.1 ]; then
+				vmove usr/share/man/man1/${f}.1
+			elif [ -f ${DESTDIR}/usr/share/man/man8/${f}.8 ]; then
+				vmove usr/share/man/man8/${f}.8
+			fi
+		done
+	}
+}
+
+mysql_package() {
+	depends="shadow mysql-client"
+	conf_files="/etc/mysql/my.cnf"
+	systemd_services="mysqld.service on"
+	system_accounts="mysql"
+	mysqld_homedir="/var/lib/mysql"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}