diff --git a/srcpkgs/gdbm/gdbm-devel.template b/srcpkgs/gdbm/gdbm-devel.template
deleted file mode 100644
index 95b4334af1c..00000000000
--- a/srcpkgs/gdbm/gdbm-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gdbm-devel'.
-#
-depends="glibc-devel"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	vmove usr/bin usr
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/share/info usr/share
-	vmove usr/share/man usr/share
-}
diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 9d3c53ae5c8..1104a755926 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -1,8 +1,7 @@
 # Template file for 'gdbm'
 pkgname=gdbm
 version=1.10
-revision=4
-subpackages="gdbm-devel"
+revision=5
 build_style=gnu-configure
 configure_args="--enable-libgdbm-compat --disable-rpath"
 short_desc="GNU database routines"
@@ -29,3 +28,20 @@ post_install() {
 	ln -sf ../ndbm.h ${DESTDIR}/usr/include/gdbm/ndbm.h
 	ln -sf ../dbm.h ${DESTDIR}/usr/include/gdbm/dbm.h
 }
+
+gdbm-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share/info
+		vmove usr/share/man
+	}
+}
+
+gdbm_package() {
+	pkg_install() {
+		vmove usr
+	}
+}