diff --git a/templates/cpio/template b/templates/cpio/template
index 424e389787..943f7dc42c 100644
--- a/templates/cpio/template
+++ b/templates/cpio/template
@@ -11,4 +11,4 @@ long_desc="
  local magnetic tapes, and both tar and cpio format archives in files or
  on tapes."
 
-run_depends="glibc-2.8"
+Add_dependency run glibc
diff --git a/templates/e2fsprogs-devel b/templates/e2fsprogs-devel
new file mode 120000
index 0000000000..84c526343b
--- /dev/null
+++ b/templates/e2fsprogs-devel
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file
diff --git a/templates/e2fsprogs-libs b/templates/e2fsprogs-libs
new file mode 120000
index 0000000000..84c526343b
--- /dev/null
+++ b/templates/e2fsprogs-libs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file
diff --git a/templates/e2fsprogs/depends b/templates/e2fsprogs/depends
new file mode 100644
index 0000000000..d681ac6041
--- /dev/null
+++ b/templates/e2fsprogs/depends
@@ -0,0 +1,2 @@
+abi_depends=1.40
+api_depends=${abi_depends}
diff --git a/templates/e2fsprogs/devel.template b/templates/e2fsprogs/devel.template
new file mode 100644
index 0000000000..ef3c11a512
--- /dev/null
+++ b/templates/e2fsprogs/devel.template
@@ -0,0 +1,31 @@
+# Template file for 'e2fsprogs-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run e2fsprogs-libs
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/lib
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/bin
+	mkdir -p ${destdir}/usr/share/info
+	mkdir -p ${destdir}/usr/share/man/man1
+
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/lib/*.*a ${destdir}/lib
+	mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib
+	for f in compile_et mk_cmds; do
+		mv ${origdir}/bin/${f} ${destdir}/usr/bin
+		mv ${origdir}/usr/share/man/man1/${f}* \
+			${destdir}/usr/share/man/man1
+	done
+	mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man
+	mv ${origdir}/usr/share/info/libext2fs.info* ${destdir}/usr/share/info
+}
diff --git a/templates/e2fsprogs/libs.template b/templates/e2fsprogs/libs.template
new file mode 100644
index 0000000000..bf964b9bcd
--- /dev/null
+++ b/templates/e2fsprogs/libs.template
@@ -0,0 +1,17 @@
+# Template file for 'e2fsprogs-libs'.
+#
+short_desc="${short_desc} (shared libraries)"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+Add_dependency run glibc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/lib
+	mv ${origdir}/lib/lib*.so.* ${destdir}/lib
+}
diff --git a/templates/e2fsprogs/template b/templates/e2fsprogs/template
index 2add8be455..dd4fabb80f 100644
--- a/templates/e2fsprogs/template
+++ b/templates/e2fsprogs/template
@@ -1,5 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
+sourcepkg=e2fsprogs
 version=1.41.4
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -23,7 +24,9 @@ long_desc="
  It provides the filesystem utilities for use with the ext2 filesystem.
  It also supports the ext3 filesystem with journaling support."
 
-run_depends="glibc-2.8"
+subpackages="devel libs"
+Add_dependency run glibc
+Add_dependency run e2fsprogs-libs
 
 post_install()
 {
diff --git a/templates/gdbm-devel b/templates/gdbm-devel
new file mode 120000
index 0000000000..f70c2130c9
--- /dev/null
+++ b/templates/gdbm-devel
@@ -0,0 +1 @@
+gdbm
\ No newline at end of file
diff --git a/templates/gdbm/devel.template b/templates/gdbm/devel.template
new file mode 100644
index 0000000000..1cd784c444
--- /dev/null
+++ b/templates/gdbm/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'gdbm-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run gdbm
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib
+}
diff --git a/templates/gdbm/template b/templates/gdbm/template
index bd62b46f71..b027020cd1 100644
--- a/templates/gdbm/template
+++ b/templates/gdbm/template
@@ -1,5 +1,6 @@
 # Template file for 'gdbm'
 pkgname=gdbm
+sourcepkg=gdbm
 version=1.8.3
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -10,4 +11,6 @@ long_desc="
  GNU dbm is a set of database routines that use extensible hashing.
  It works similar to the standard Unix dbm routines."
 
-run_depends="glibc-2.8"
+subpackages="devel"
+
+Add_dependency run glibc
diff --git a/templates/groff/template b/templates/groff/template
index a6958e2aef..e13ef8c962 100644
--- a/templates/groff/template
+++ b/templates/groff/template
@@ -16,7 +16,11 @@ long_desc="
  All the standard macro packages are supported. A number of other utilities
  are also included together with several fonts."
 
-run_depends="glibc-2.8"
+Add_dependency run glibc
+Add_dependency run gcc-libstdc++
+Add_dependency run bash
+Add_dependency run zlib
+Add_dependency run sed
 
 pre_install()
 {
diff --git a/templates/less/template b/templates/less/template
index b49dfdbb41..9785984894 100644
--- a/templates/less/template
+++ b/templates/less/template
@@ -14,5 +14,5 @@ long_desc="
  termcap (or terminfo on some systems), so it can run on a variety of
  terminals.  There is even limited support for hardcopy terminals."
 
-build_depends="ncurses-5.6" 
-run_depends="glibc-2.8 ncurses-5.6"
+Add_dependency run	glibc
+Add_dependency full	ncurses
diff --git a/templates/man-db/template b/templates/man-db/template
index 291f3f3f12..dbc55a09e6 100644
--- a/templates/man-db/template
+++ b/templates/man-db/template
@@ -16,5 +16,11 @@ long_desc="
  GNU/Linux distributions, including Debian, Ubuntu, and SuSE. It also compiles
  and runs on a number of proprietary Unix systems."
 
-build_depends="bzip2-1.0.5 gzip-1.3.12 less-424 gdbm-1.8.3 groff-1.19.2"
-run_depends="glibc-2.8 $build_depends"
+Add_dependency run glibc
+Add_dependency full bzip2
+Add_dependency full gzip
+Add_dependency full less
+Add_dependency full gdbm
+Add_dependency full groff
+Add_dependency full grep
+Add_dependency full lzma-utils
diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template
index 7018c525a7..9369cf792b 100644
--- a/templates/util-linux-ng/template
+++ b/templates/util-linux-ng/template
@@ -14,8 +14,12 @@ long_desc="
  them are utilities for handling file systems, consoles, partitions,
  and messages."
 
-build_depends="e2fsprogs-1.41.3"
-run_depends="glibc-2.8 $build_depends"
+Add_dependency build	e2fsprogs-devel
+Add_dependency run	glibc
+Add_dependency run	e2fsprogs-libs
+Add_dependency run	coreutils
+Add_dependency run	ncurses-libs
+Add_dependency run	zlib
 
 post_install()
 {