diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 9a9dc4644b0..85e73bc8646 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -5,8 +5,7 @@ revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
 hostmakedepends="flex"
-makedepends="libfl-devel pam-devel"
-replaces="kbd-common<1.15.5"
+makedepends="pam-devel"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,6 +13,10 @@ homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
 distfiles="${homepage}/kbd-${version}.tar.gz"
 checksum=e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62
 
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
 pre_configure() {
 	# Rename keymap files with the same names
 	# this is needed because when only name of keymap is specified
@@ -33,3 +36,10 @@ post_install() {
 		rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f}
 	done
 }
+
+kbd_package() {
+	replaces="kbd-common<1.15.5"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kbproto/template b/srcpkgs/kbproto/template
index 9631ccca321..d25d5c2146c 100644
--- a/srcpkgs/kbproto/template
+++ b/srcpkgs/kbproto/template
@@ -1,15 +1,20 @@
 # Template build file for 'kbproto'.
 pkgname=kbproto
 version=1.0.4
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 revision=2
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 short_desc="KB extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
 long_desc="
  This provides the KB extension headers from modular X.org X11 project."
 
-noarch=yes
+kbproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/keepassx/template b/srcpkgs/keepassx/template
index 61b035d868b..642bb70dcbe 100644
--- a/srcpkgs/keepassx/template
+++ b/srcpkgs/keepassx/template
@@ -2,8 +2,8 @@
 pkgname=keepassx
 version=0.4.3
 revision=1
-depends="shared-mime-info"
-makedepends="pkg-config libXtst-devel qt-devel"
+hostmakedepends="pkg-config"
+makedepends="libXtst-devel qt-devel shared-mime-info"
 short_desc="A password manager to secure personal data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,3 +20,10 @@ do_build() {
 do_install() {
 	make INSTALL_ROOT=${DESTDIR} install
 }
+
+keepassx_package() {
+	depends="shared-mime-info"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index 6bf03c24f71..d377a88fb80 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -11,16 +11,14 @@ distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
 checksum=e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255
 
 bootstrap=yes
-nostrip=yes
-noverifyrdeps=yes
 
 if [ -n "$IN_CHROOT" ]; then
 	makedepends="perl"
 fi
 
-if [ "$XBPS_MACHINE" = "i686" -o "$XBPS_MACHINE" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_arch="ARCH=x86"
-elif [ "$XBPS_MACHINE" = "armv6l" ]; then
+elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 	_arch="ARCH=arm"
 else
 	msg_error "$pkgver: unknown architecture.\n"
@@ -38,3 +36,11 @@ do_install() {
 	# Remove drm headers, use libdrm.
 	rm -rf ${DESTDIR}/usr/include/drm
 }
+
+kernel-libc-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel-manpages/template b/srcpkgs/kernel-manpages/template
index 2f0bb8124c2..a64d7667b37 100644
--- a/srcpkgs/kernel-manpages/template
+++ b/srcpkgs/kernel-manpages/template
@@ -4,7 +4,6 @@ pkgname=kernel-manpages
 version=3.2.6
 revision=2
 wrksrc=linux-${version}
-noarch=yes
 makedepends="which perl xmlto"
 homepage="http://www.kernel.org"
 license="GPL-2"
@@ -22,3 +21,10 @@ do_install() {
 	vmkdir usr/share/man/man9
 	install -m644 Documentation/DocBook/man/*.9.gz ${DESTDIR}/usr/share/man/man9
 }
+
+kernel-manpages_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel-rpi/kernel-headers-rpi.template b/srcpkgs/kernel-rpi/kernel-headers-rpi.template
deleted file mode 100644
index b78c57aec09..00000000000
--- a/srcpkgs/kernel-rpi/kernel-headers-rpi.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'kernel-headers'.
-#
-nostrip=yes
-noverifyrdeps=yes
-short_desc="Linux kernel source headers for the RaspberryPI"
-
-do_install() {
-	vmove usr/src usr
-	vmove usr/lib/modules/${_kernver}/build usr/lib/modules/${_kernver}
-
-}
diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/kernel-rpi/template
index 57cf742b12e..a86605118cb 100644
--- a/srcpkgs/kernel-rpi/template
+++ b/srcpkgs/kernel-rpi/template
@@ -11,27 +11,10 @@ short_desc="The Linux kernel and modules for the Raspberry Pi"
 distfiles="http://xbps.nopcode.org/distfiles/linux-rpi-20130219.tar.xz"
 checksum=930176da46b88ebff880ae6f0b397b78a60e23670edcbc821e82e19bcada4c56
 
-nostrip=yes
-noverifyrdeps=yes
-provides="kernel-${version}"
-subpackages="kernel-headers-rpi"
-triggers="kernel-hooks"
-
-depends="kmod>=11_2"
-makedepends="perl python kmod>=11_2 uboot-mkimage ncurses-devel"
-only_for_archs="armv6l"
-
 _kernver="${version}_${revision}"
-
-# These files could be modified when an external module is built.
-mutable_files="
-/usr/lib/modules/${_kernver}/modules.dep
-/usr/lib/modules/${_kernver}/modules.dep.bin
-/usr/lib/modules/${_kernver}/modules.symbols
-/usr/lib/modules/${_kernver}/modules.symbols.bin
-/usr/lib/modules/${_kernver}/modules.alias
-/usr/lib/modules/${_kernver}/modules.alias.bin
-/usr/lib/modules/${_kernver}/modules.devname"
+hostmakedepends="perl python kmod>=11_2 uboot-mkimage"
+makedepends="ncurses-devel"
+only_for_archs="armv6l"
 
 do_configure() {
 	if [ -n "$CROSS_BUILD" ]; then
@@ -168,3 +151,34 @@ do_install() {
 	# ... and run depmod again.
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
+
+kernel-headers-rpi_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	short_desc="Linux kernel source headers for the RaspberryPI"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+
+kernel-rpi_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	provides="kernel-${version}"
+	triggers="kernel-hooks"
+	depends="kmod>=11_2"
+	# These files could be modified when an external module is built.
+	mutable_files="
+		/usr/lib/modules/${_kernver}/modules.dep
+		/usr/lib/modules/${_kernver}/modules.dep.bin
+		/usr/lib/modules/${_kernver}/modules.symbols
+		/usr/lib/modules/${_kernver}/modules.symbols.bin
+		/usr/lib/modules/${_kernver}/modules.alias
+		/usr/lib/modules/${_kernver}/modules.alias.bin
+		/usr/lib/modules/${_kernver}/modules.devname"
+	pkg_install() {
+		vmove boot
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
deleted file mode 100644
index 1ad8c3aacce..00000000000
--- a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'kernel-snapshot-headers'.
-#
-nostrip=yes
-noverifyrdeps=yes
-short_desc="${pkgname} src headers"
-long_desc="
- This package contains the required source headers to be able to build
- external 3rd party binary modules."
-
-do_install() {
-	vmove usr/src usr
-	vmove usr/lib/modules/${_kernver}/build usr/lib/modules/${_kernver}
-}
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 27d712c85da..c33b6e02b29 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -16,26 +16,7 @@ distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}
 checksum=88d25af982a9c66c4dc357319899b8673c33f810dcb000d300cb2920c7ab23d2
 
 _kernver="${_kmajor}.${_kminor}-${_kpatch}_${revision}"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
-/usr/lib/modules/${_kernver}/modules.dep
-/usr/lib/modules/${_kernver}/modules.dep.bin
-/usr/lib/modules/${_kernver}/modules.symbols
-/usr/lib/modules/${_kernver}/modules.symbols.bin
-/usr/lib/modules/${_kernver}/modules.alias
-/usr/lib/modules/${_kernver}/modules.alias.bin
-/usr/lib/modules/${_kernver}/modules.devname"
-
-nostrip=yes
-noverifyrdeps=yes
-preserve=yes
-
-depends="dracut linux-firmware kmod>=11_2"
 makedepends="perl kmod>=11_2 openssl which elfutils"
-subpackages="${pkgname}-headers"
-triggers="kernel-hooks"
 
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
@@ -205,3 +186,35 @@ do_install() {
 	# ... and run depmod again.
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
+
+kernel-snapshot-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+
+kernel-snapshot_package() {
+	# These files could be modified when an external module is built.
+	mutable_files="
+		/usr/lib/modules/${_kernver}/modules.dep
+		/usr/lib/modules/${_kernver}/modules.dep.bin
+		/usr/lib/modules/${_kernver}/modules.symbols
+		/usr/lib/modules/${_kernver}/modules.symbols.bin
+		/usr/lib/modules/${_kernver}/modules.alias
+		/usr/lib/modules/${_kernver}/modules.alias.bin
+		/usr/lib/modules/${_kernver}/modules.devname"
+	nostrip=yes
+	noverifyrdeps=yes
+	preserve=yes
+	depends="dracut linux-firmware kmod>=11_2"
+	kernel_hooks_version="${_kernver}"
+	triggers="kernel-hooks"
+	pkg_install() {
+		vmove boot
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template
index d9d03b71054..cc32cfb48c7 100644
--- a/srcpkgs/kernel-uml/template
+++ b/srcpkgs/kernel-uml/template
@@ -1,15 +1,13 @@
 # Build template for 'kernel-uml'
 pkgname=kernel-uml
 version=3.8.5
+revision=1
 wrksrc=linux-${version}
 homepage="http://www.kernel.org"
 license="GPL-2"
+short_desc="Kernel ${version} for User Mode Linux"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
 checksum=1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f
-makedepends="perl>=0 libpcap-devel"
-fulldepends="uml-utilities"
-revision=1
-short_desc="Kernel ${version} for User Mode Linux"
 long_desc="
  User-mode Linux (UML) is a port of the Linux kernel to its own system call
  interface. It provides a kind of virtual machine, which runs Linux as a user
@@ -19,6 +17,7 @@ long_desc="
  This package contains the kernel itself, as an executable program, and the
  associated kernel modules."
 
+makedepends="perl libpcap-devel uml-utilities"
 
 do_build() {
 	make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs}
@@ -31,3 +30,10 @@ do_install() {
 	mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml
 	rmdir ${DESTDIR}/usr/lib/uml/lib
 }
+
+kernel-uml_package() {
+	depends="uml-utilities"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kernel/kernel-headers.template b/srcpkgs/kernel/kernel-headers.template
deleted file mode 100644
index 2da74e9a098..00000000000
--- a/srcpkgs/kernel/kernel-headers.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'kernel-headers'.
-#
-nostrip=yes
-noverifyrdeps=yes
-short_desc="${pkgname} source headers"
-
-do_install() {
-	vmove usr/src usr
-	vmove usr/lib/modules/${_kernver}/build usr/lib/modules/${_kernver}
-
-}
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index fa288bab900..1819cbcdc98 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -11,34 +11,16 @@ short_desc="The Linux kernel and modules"
 distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
 checksum=afa898f3329c1f4aaede6e3dab57f7c522617e1b67f7c1abd73a91253a0cd10c
 
-nostrip=yes
-noverifyrdeps=yes
-preserve=yes
-subpackages="kernel-headers"
-triggers="kernel-hooks"
-
-depends="dracut linux-firmware kmod>=11_2"
 makedepends="perl kmod>=11_2 openssl which elfutils"
-
 _kernver="${version}_${revision}"
 
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff
 	# as modules (defconfig+allmodconfig).
 	local arch
 
-	if [ "$XBPS_MACHINE" != "x86_64" ]; then
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
 		arch=i386
 	else
 		arch=x86_64
@@ -64,7 +46,7 @@ do_build() {
 do_install() {
 	local arch hdrdest
 
-	if [ "$XBPS_MACHINE" != "x86_64" ]; then
+	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
 		arch=i386
 	else
 		arch=x86_64
@@ -200,3 +182,34 @@ do_install() {
 	# ... and run depmod again.
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
+
+kernel-headers_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+
+kernel_package() {
+	nostrip=yes
+	noverifyrdeps=yes
+	preserve=yes
+	triggers="kernel-hooks"
+	depends="dracut linux-firmware kmod>=11_2"
+	# These files could be modified when an external module is built.
+	mutable_files="
+		/usr/lib/modules/${_kernver}/modules.dep
+		/usr/lib/modules/${_kernver}/modules.dep.bin
+		/usr/lib/modules/${_kernver}/modules.symbols
+		/usr/lib/modules/${_kernver}/modules.symbols.bin
+		/usr/lib/modules/${_kernver}/modules.alias
+		/usr/lib/modules/${_kernver}/modules.alias.bin
+		/usr/lib/modules/${_kernver}/modules.devname"
+	pkg_install() {
+		vmove boot
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 4cd7e02a121..9d7e68a902a 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -15,3 +15,9 @@ long_desc="
  context of already running kernel without going through BIOS. BIOS can be very
  time consuming especially on the big servers with lots of peripherals. This can
  save a lot of time for developers who end up booting a machine numerous times."
+
+kexec-tools_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/keychain/template b/srcpkgs/keychain/template
index 99aef22c91f..f6b50165b94 100644
--- a/srcpkgs/keychain/template
+++ b/srcpkgs/keychain/template
@@ -2,8 +2,7 @@
 pkgname=keychain
 version=2.7.1
 revision=2
-noarch=yes
-makedepends="perl"
+hostmakedepends="perl"
 short_desc="keychain manager for ssh-agent and gpg-agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.funtoo.org/wiki/Keychain"
@@ -24,3 +23,10 @@ do_install() {
 	vinstall keychain 755 usr/bin
 	vinstall keychain.1 644 usr/share/man/man1
 }
+
+keychain_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/keyutils/keyutils-devel.template b/srcpkgs/keyutils/keyutils-devel.template
deleted file mode 100644
index 222666f0fe1..00000000000
--- a/srcpkgs/keyutils/keyutils-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'keyutils-devel'.
-#
-depends="libkeyutils>=1.5.5"
-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/share/man/man3 usr/share/man
-}
diff --git a/srcpkgs/keyutils/libkeyutils.template b/srcpkgs/keyutils/libkeyutils.template
deleted file mode 100644
index a3ea6b266d3..00000000000
--- a/srcpkgs/keyutils/libkeyutils.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libkeyutils'.
-#
-short_desc="${short_desc} -- runtime library"
-long_desc="${long_desc}
-
- This package contains the runtime shared library."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index fe179e5cf23..51de41ff903 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -1,28 +1,55 @@
 # Template file for 'keyutils'
 pkgname=keyutils
 version=1.5.5
-distfiles="http://people.redhat.com/~dhowells/$pkgname/$pkgname-$version.tar.bz2"
-build_style=gnu-makefile
 revision=1
+build_style=gnu-makefile
 short_desc="Linux Key Management Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2, LGPL-2.1"
+distfiles="http://people.redhat.com/~dhowells/$pkgname/$pkgname-$version.tar.bz2"
 checksum=8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5
 long_desc="
  These tools are used to control the key management system built into the
  Linux kernel."
 
-conf_files="/etc/request-key.conf"
-subpackages="lib${pkgname} ${pkgname}-devel"
-
 pre_build() {
 	sed -i "s|/lib64|/lib|g" Makefile
 }
 
 post_install() {
-	vmove "sbin/*" usr/sbin
-	vmove "bin/*" usr/bin
-	vmove "lib/*" usr/lib
+	vmkdir usr/lib
+	vmkdir usr/bin
+	vmkdir usr/sbin
+
+	mv ${DESTDIR}/bin/* ${DESTDIR}/usr/bin
+	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
+	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
+
 	cd ${DESTDIR}/usr/lib && ln -sf libkeyutils.so.1 libkeyutils.so
 }
+
+libkeyutils_package() {
+	short_desc="${short_desc} -- runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+keyutils-devel_package() {
+	depends="libkeyutils>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+	}
+}
+
+keyutils_package() {
+	conf_files="/etc/request-key.conf"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kmod/libkmod-devel.template b/srcpkgs/kmod/libkmod-devel.template
deleted file mode 100644
index e17c0f7ef80..00000000000
--- a/srcpkgs/kmod/libkmod-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libkmod-devel'.
-#
-depends="zlib-devel libkmod>=${version}"
-short_desc="${short_desc} - development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/kmod/libkmod.template b/srcpkgs/kmod/libkmod.template
deleted file mode 100644
index 78d17e5b27d..00000000000
--- a/srcpkgs/kmod/libkmod.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# Template file for 'libkmod'.
-#
-short_desc="${short_desc} - runtime shared library"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index e7d957da337..4403020d6bf 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -1,14 +1,11 @@
 # Template file for 'kmod'
 pkgname=kmod
 version=12
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-zlib --with-xz"
 hostmakedepends="pkg-config libxslt"
 makedepends="zlib-devel liblzma-devel"
-provides="module-init-tools-3.17"
-replaces="module-init-tools>=0"
-subpackages="libkmod libkmod-devel"
 short_desc="Linux kernel module handling"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,14 +13,8 @@ homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
 distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
 checksum=c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f
 
-make_dirs="
-/etc/depmod.d 0755 root root
-/etc/modprobe.d 0755 root root
-/usr/lib/depmod.d 0755 root root
-/usr/lib/modprobe.d 0755 root root"
-
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake pkg-config libxslt"
+	hostmakedepends="libtool automake pkg-config libxslt"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -37,3 +28,33 @@ post_install() {
 		cd ${DESTDIR}/usr/sbin && ln -sf ../bin/kmod $tool
 	done
 }
+
+libkmod_package() {
+	short_desc="${short_desc} - runtime shared library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libkmod-devel_package() {
+	depends="zlib-devel libkmod>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+kmod_package() {
+	make_dirs="
+		/etc/depmod.d 0755 root root
+		/etc/modprobe.d 0755 root root
+		/usr/lib/depmod.d 0755 root root
+		/usr/lib/modprobe.d 0755 root root"
+	provides="module-init-tools-3.17"
+	replaces="module-init-tools>=0"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 3cd9a9178e2..084ad4d7e20 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -6,8 +6,8 @@ build_style=gnu-configure
 configure_args="--enable-kmscon --disable-wlterm --enable-multi-seat
  --enable-hotplug --enable-pciaccess --enable-eloop-dbus --disable-static"
 makedepends="pkg-config docbook-xsl MesaLib-devel pango-devel libxkbcommon-devel
- libpciaccess-devel libudev-devel systemd-devel dbus-devel fuse-devel"
-fulldepends="xkeyboard-config"
+ libpciaccess-devel libudev-devel systemd-devel dbus-devel fuse-devel
+ xkeyboard-config"
 short_desc="Terminal emulator based on Kernel Mode Setting (KMS)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -23,3 +23,10 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	rm -rf ${DESTDIR}/usr/lib/pkgconfig
 }
+
+kmscon_package() {
+	depends="xkeyboard-config"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kyua-cli/template b/srcpkgs/kyua-cli/template
index 2d4d110d632..2d93e2e0adf 100644
--- a/srcpkgs/kyua-cli/template
+++ b/srcpkgs/kyua-cli/template
@@ -3,9 +3,8 @@ pkgname=kyua-cli
 version=0.6
 revision=1
 build_style=gnu-configure
-replaces="kyua>=0"
-fulldepends="kyua-testers"
-makedepends="pkg-config doxygen atf-devel>=0.16 lutok-devel>=0.2 sqlite-devel"
+hostmakedepends="pkg-config doxygen"
+makedepends="atf-devel>=0.16 lutok-devel>=0.2 sqlite-devel kyua-testers"
 short_desc="Kyua (automated testing framework) - Command line interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Modified BSD"
@@ -18,3 +17,11 @@ long_desc="
  user experience before anything else. There are multiple reasons for users to
  run the tests themselves, and Kyua ensures that they can do so in the most
  convenient way."
+
+kyua-cli_package() {
+	depends="kyua-testers"
+	replaces="kyua>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/kyua-testers/template b/srcpkgs/kyua-testers/template
index bf80cb51d9d..3dee649f446 100644
--- a/srcpkgs/kyua-testers/template
+++ b/srcpkgs/kyua-testers/template
@@ -21,3 +21,9 @@ long_desc="
  with test programs of various kinds. The interface of such testers
  allows the caller to execute a single test case of a single test program
  in a controlled and homogeneous manner."
+
+kyua-testers_package() {
+	pkg_install() {
+		vmove usr
+	}
+}