diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 9744dcf710f..f83f37afdc5 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -3,7 +3,6 @@ pkgname=zlib
 version=1.2.7
 revision=1
 bootstrap=yes
-subpackages="zlib-devel"
 short_desc="A compression/decompression Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="zlib"
@@ -26,3 +25,20 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} LDCONFIG= install
 }
+
+zlib-devel_package() {
+	depends="zlib>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share
+	}
+}
+
+zlib_package() {
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/zlib/zlib-devel.template b/srcpkgs/zlib/zlib-devel.template
deleted file mode 100644
index cf8ea7dadcc..00000000000
--- a/srcpkgs/zlib/zlib-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'zlib-devel'.
-#
-depends="glibc-devel zlib"
-short_desc="${short_desc} - 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
-	mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-}