diff --git a/srcpkgs/cloog/cloog-devel.template b/srcpkgs/cloog/cloog-devel.template
deleted file mode 100644
index 39710c28090..00000000000
--- a/srcpkgs/cloog/cloog-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'cloog-devel'.
-#
-depends="gmp-devel cloog>=${version}"
-replaces="cloog-ppl-devel>=0"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 64ad5aee6a4..1fef48e7049 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -5,8 +5,6 @@ revision=3
 build_style=gnu-configure
 configure_args="--with-isl=system --with-gmp=system"
 makedepends="gmp-devel isl-devel"
-subpackages="cloog-devel"
-replaces="cloog-ppl>=0"
 short_desc="Library that generates loops for scanning polyhedra"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bastoul.net/cloog/"
@@ -15,5 +13,23 @@ distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz"
 checksum=f265f5069830c03d2919a7673c0963495437d6d79a8cbd3474cde2d4e3291e04
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args="${configure_args} --with-gmp-exec-prefix=$XBPS_CROSS_BASE"
+	configure_args+=" --with-gmp-exec-prefix=$XBPS_CROSS_BASE"
 fi
+
+cloog-devel_package() {
+	depends="gmp-devel cloog>=${version}"
+	replaces="cloog-ppl-devel>=0"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+cloog_package() {
+	replaces="cloog-ppl>=0"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/gmp/gmp-devel.template b/srcpkgs/gmp/gmp-devel.template
deleted file mode 100644
index 24d7945f00c..00000000000
--- a/srcpkgs/gmp/gmp-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'gmp-devel'.
-#
-depends="glibc-devel gmp>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index 3cf303603a4..903aa815705 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -2,14 +2,13 @@
 pkgname=gmp
 version=5.1.1
 revision=1
-subpackages="gmp-devel"
 build_style=gnu-configure
 # Build with -fexceptions as suggested by ppl.
 CPPFLAGS="-fexceptions"
+configure_args="--enable-cxx --build=${XBPS_MACHINE}-unknown-linux-gnu"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	cnfigure_args="ABI=32"
+	cnfigure_args+=" ABI=32"
 fi
-configure_args="${configure_args} --enable-cxx --build=${XBPS_MACHINE}-unknown-linux-gnu"
 makedepends="zlib-devel"
 short_desc="Library for arbitrary precision arithmetic"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,3 +23,19 @@ if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi
 	}
 fi
+
+gmp-devel_package() {
+	depends="gmp>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+gmp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/isl/isl-devel.template b/srcpkgs/isl/isl-devel.template
deleted file mode 100644
index 8e835c742c9..00000000000
--- a/srcpkgs/isl/isl-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'isl-devel'.
-#
-depends="gmp-devel isl>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 2b9faf918ef..35e92852314 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -3,7 +3,6 @@ pkgname=isl
 version=0.11.1
 revision=2
 build_style=gnu-configure
-subpackages="isl-devel"
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,3 +15,19 @@ post_install() {
 	# Remove gdb python files.
 	rm -f ${DESTDIR}/usr/lib/*.py
 }
+
+isl-devel_package() {
+	depends="gmp-devel isl>=$version"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+isl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mpc/mpc-devel.template b/srcpkgs/mpc/mpc-devel.template
deleted file mode 100644
index 695b4ba8ad0..00000000000
--- a/srcpkgs/mpc/mpc-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'mpc-devel'.
-#
-depends="gmp-devel mpfr-devel mpc>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share usr
-}
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index 20d0dd95ce4..02bae3a4735 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -3,7 +3,6 @@ pkgname=mpc
 version=0.9
 revision=2
 build_style=gnu-configure
-subpackages="mpc-devel"
 configure_args="EGREP=egrep"
 makedepends="gmp-devel mpfr-devel"
 short_desc="C library for the arithmetic of complex numbers"
@@ -12,3 +11,19 @@ homepage="http://www.multiprecision.org"
 license="LGPL-3"
 distfiles="http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz"
 checksum=fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
+
+mpc-devel_package() {
+	depends="gmp-devel mpfr-devel mpc>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+mpc_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/mpfr/mpfr-devel.template b/srcpkgs/mpfr/mpfr-devel.template
deleted file mode 100644
index f543371b41d..00000000000
--- a/srcpkgs/mpfr/mpfr-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'mpfr-devel'.
-#
-depends="gmp-devel mpfr>=$version"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template
index 0c2f2cb7b48..e25190d1a06 100644
--- a/srcpkgs/mpfr/template
+++ b/srcpkgs/mpfr/template
@@ -4,7 +4,6 @@ version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-thread-safe"
-subpackages="$pkgname-devel"
 makedepends="gmp-devel"
 short_desc="Library for multiple-precision floating-point computations"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,3 +11,19 @@ license="LGPL-3"
 homepage="http://www.mpfr.org"
 distfiles="${homepage}/mpfr-current/$pkgname-$version.tar.bz2"
 checksum=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
+
+mpfr-devel_package() {
+	depends="gmp-devel mpfr>=$version"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share
+		vmove "usr/lib/*.a"
+	}
+}
+
+mpfr_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/ppl/ppl-devel.template b/srcpkgs/ppl/ppl-devel.template
deleted file mode 100644
index 4b250698bd3..00000000000
--- a/srcpkgs/ppl/ppl-devel.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'ppl-devel'.
-#
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	for d in bin include share; do
-		vmove usr/${d} usr
-	done
-	vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index d29cdda146f..a0462833b93 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -2,7 +2,6 @@
 pkgname=ppl
 version=1.0
 revision=2
-subpackages="ppl-devel"
 build_style=gnu-configure
 configure_args="--enable-interfaces=c,cxx"
 makedepends="gmp-devel>=5.1.1"
@@ -25,3 +24,20 @@ fi
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 }
+
+ppl-devel_package() {
+	depends="ppl>=${version}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		for d in bin include share; do
+			vmove usr/${d}
+		done
+		vmove "usr/lib/*.a"
+	}
+}
+
+ppl_package() {
+	pkg_install() {
+		vmove usr
+	}
+}