diff --git a/shutils/binpkg.sh b/shutils/binpkg.sh
index 3d77dfcca6e..cdb593647fc 100644
--- a/shutils/binpkg.sh
+++ b/shutils/binpkg.sh
@@ -56,6 +56,7 @@ xbps_write_metadata_pkg()
 		if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then
 			msg_error "Cannot find subpackage template!"
 		fi
+		unset run_depends
 		. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
 		pkgname=${sourcepkg}-${subpkg}
 		xbps_write_metadata_pkg_real
@@ -65,13 +66,11 @@ xbps_write_metadata_pkg()
 
 	[ -n "${subpackages}" ] && [ "$pkg" != "${sourcepkg}" ] && return $?
 
-	if [ -n "${subpackages}" ]; then
-		run_template ${sourcepkg}
-		unset run_depends
+	if [ -z "${run_depends}" ]; then
+		for subpkg in ${subpackages}; do
+			run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
+		done
 	fi
-	for subpkg in ${subpackages}; do
-		run_depends="$run_depends ${sourcepkg}-${subpkg}-${version}"
-	done
 	xbps_write_metadata_pkg_real
 }
 
diff --git a/shutils/pkgtarget_funcs.sh b/shutils/pkgtarget_funcs.sh
index ac56c520dbc..76b3d7322ce 100644
--- a/shutils/pkgtarget_funcs.sh
+++ b/shutils/pkgtarget_funcs.sh
@@ -23,6 +23,8 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
 
+. ${XBPS_SHUTILSDIR}/tmpl_funcs.sh
+
 #
 # Installs a pkg by reading its build template file.
 #
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 00fc99ac9d9..ead88b8cb99 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -69,6 +69,7 @@ reset_tmpl_vars()
 			disable_parallel_build run_depends cross_compiler \
 			only_for_archs patch_args conf_files keep_dirs \
 			install_priority noarch subpackages sourcepkg \
+			abi_depends api_depends \
 			XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
 			XBPS_BUILD_DONE XBPS_INSTALL_DONE"
 
@@ -104,6 +105,46 @@ setup_tmpl()
 
 }
 
+Add_dependency()
+{
+	local type="$1"
+	local pkgname="$2"
+	local minver="$3"
+
+	case "$type" in
+		build|full|run) ;;
+		*) msg_error "Unknown dependency type for $pkgname." ;;
+	esac
+
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends ]; then
+		. $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends
+	elif [ -f $XBPS_TEMPLATESDIR/$pkgname/depends ]; then
+		. $XBPS_TEMPLATESDIR/$pkgname/depends
+	fi
+
+	if [ "$type" = "full" -o "$type" = "build" ]; then
+		if [ -z "$minver" -a -z "$api_depends" ]; then
+			build_depends="${build_depends} $pkgname-0"
+		elif [ -z "$minver" -a -n "$api_depends" ]; then
+			build_depends="${build_depends} $pkgname-$api_depends"
+		else
+			build_depends="${build_depends} $pkgname-$minver"
+		fi
+	fi
+
+	if [ "$type" = "full" -o "$type" = "run" ]; then
+		if [ -z "$minver" -a -z "$abi_depends" ]; then
+			run_depends="${run_depends} $pkgname-0"
+		elif [ -z "$minver" -a -n "$abi_depends" ]; then
+			run_depends="${run_depends} $pkgname-$abi_depends"
+		else
+			run_depends="${run_depends} $pkgname-$minver"
+		fi
+	fi
+
+	unset abi_depends api_depends
+}
+
 #
 # Checks some vars used in templates and sets some of them required.
 #
diff --git a/templates/bash/template b/templates/bash/template
index c8c101f6ae7..611b7f0d522 100644
--- a/templates/bash/template
+++ b/templates/bash/template
@@ -1,6 +1,6 @@
 # Template build file for 'bash'.
 pkgname=bash
-version=3.2.48
+version=4.0
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--without-bash-malloc --with-curses
@@ -8,7 +8,7 @@ configure_args="--without-bash-malloc --with-curses
  ac_cv_func_working_mktime=yes"
 short_desc="The GNU Bourne Again Shell"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=28e9dc561b48a6675dbb30b5875e066d74cfac6a4eb261755dd2d93a38d301c5
+checksum=9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518
 long_desc="
  Bash is an sh-compatible shell that incorporates useful features from
  the Korn shell (ksh) and C shell (csh). It is intended to conform to
@@ -22,4 +22,6 @@ long_desc="
  modification."
 
 base_chroot=yes
-run_depends="glibc-2.8 ncurses-5.6"
+
+Add_dependency run	glibc
+Add_dependency full	ncurses
diff --git a/templates/binutils-dev b/templates/binutils-dev
deleted file mode 120000
index 695eb82eae6..00000000000
--- a/templates/binutils-dev
+++ /dev/null
@@ -1 +0,0 @@
-binutils
\ No newline at end of file
diff --git a/templates/binutils-base b/templates/binutils-devel
similarity index 100%
rename from templates/binutils-base
rename to templates/binutils-devel
diff --git a/templates/binutils-docs b/templates/binutils-docs
deleted file mode 120000
index 695eb82eae6..00000000000
--- a/templates/binutils-docs
+++ /dev/null
@@ -1 +0,0 @@
-binutils
\ No newline at end of file
diff --git a/templates/binutils-locale b/templates/binutils-locale
deleted file mode 120000
index 695eb82eae6..00000000000
--- a/templates/binutils-locale
+++ /dev/null
@@ -1 +0,0 @@
-binutils
\ No newline at end of file
diff --git a/templates/binutils/base.template b/templates/binutils/base.template
deleted file mode 100644
index 8145d9bcf23..00000000000
--- a/templates/binutils/base.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'binutils-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and libraries."
-run_depends="glibc-libs-2.8"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/usr/lib
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/lib/libbfd-${version}.so ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/libopcodes-${version}.so ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib
-}
diff --git a/templates/binutils/depends b/templates/binutils/depends
new file mode 100644
index 00000000000..e877967f3c7
--- /dev/null
+++ b/templates/binutils/depends
@@ -0,0 +1,2 @@
+abi_depends=2.18
+api_depends=${abi_depends}
diff --git a/templates/binutils/dev.template b/templates/binutils/devel.template
similarity index 82%
rename from templates/binutils/dev.template
rename to templates/binutils/devel.template
index d21319a26b9..313b5ac5248 100644
--- a/templates/binutils/dev.template
+++ b/templates/binutils/devel.template
@@ -1,10 +1,11 @@
-# Template file for 'binutils-dev'.
+# Template file for 'binutils-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="binutils-2.19"
+
+Add_dependency run binutils
 
 do_install()
 {
@@ -19,4 +20,5 @@ do_install()
 			mv ${origdir}/usr/lib/${f}.so ${destdir}/usr/lib
 		fi
 	done
+	mv ${origdir}/usr/lib/ldscripts ${destdir}/usr/lib
 }
diff --git a/templates/binutils/docs.template b/templates/binutils/docs.template
deleted file mode 100644
index e6de5db259f..00000000000
--- a/templates/binutils/docs.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'binutils-docs'.
-#
-short_desc="${short_desc} (documentation)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} documentation: manual pages
- and info files."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move manpages and info files.
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \
-		${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \
-		${destdir}/usr/share
-}
diff --git a/templates/binutils/locale.template b/templates/binutils/locale.template
deleted file mode 100644
index 7af89be443c..00000000000
--- a/templates/binutils/locale.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'binutils-locales'.
-#
-short_desc="${short_desc} (locales)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} locale files, for non US users."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}
diff --git a/templates/binutils/template b/templates/binutils/template
index ad5e19e5376..45ab510c5c9 100644
--- a/templates/binutils/template
+++ b/templates/binutils/template
@@ -25,4 +25,6 @@ long_desc="
  and other tools."
 
 base_chroot=yes
-subpackages="base dev docs locale"
+subpackages="devel"
+
+Add_dependency run glibc
diff --git a/templates/bzip2-devel b/templates/bzip2-devel
new file mode 120000
index 00000000000..a989e1da11a
--- /dev/null
+++ b/templates/bzip2-devel
@@ -0,0 +1 @@
+bzip2
\ No newline at end of file
diff --git a/templates/bzip2/depends b/templates/bzip2/depends
new file mode 100644
index 00000000000..f847cf49272
--- /dev/null
+++ b/templates/bzip2/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.5
+api_depends=${abi_depends}
diff --git a/templates/glibc/dev.template b/templates/bzip2/devel.template
similarity index 75%
rename from templates/glibc/dev.template
rename to templates/bzip2/devel.template
index 208b19aaf84..f49bfbeb7c1 100644
--- a/templates/glibc/dev.template
+++ b/templates/bzip2/devel.template
@@ -1,10 +1,11 @@
-# Template file for 'glibc-dev'.
+# Template file for 'bzip2-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="glibc-libs-${version}"
+
+Add_dependency run bzip2
 
 do_install()
 {
@@ -13,5 +14,5 @@ do_install()
 
 	mkdir -p ${destdir}/usr/lib
 	mv ${origdir}/usr/include ${destdir}/usr
-	mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libbz2.*a ${destdir}/usr/lib
 }
diff --git a/templates/bzip2/template b/templates/bzip2/template
index 7b2b63e4e85..d1c9dde93d0 100644
--- a/templates/bzip2/template
+++ b/templates/bzip2/template
@@ -1,5 +1,6 @@
 # Template build file for 'bzip2'.
 pkgname=bzip2
+sourcepkg=bzip2
 version=1.0.5
 distfiles="http://www.bzip.org/1.0.5/$pkgname-$version.tar.gz"
 build_style=gnu_makefile
@@ -24,4 +25,6 @@ long_desc="
  predecessor, bzip (.bz)."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="devel"
+
+Add_dependency run glibc
diff --git a/templates/coreutils/template b/templates/coreutils/template
index 042ed8aa20b..6e5ecb3d922 100644
--- a/templates/coreutils/template
+++ b/templates/coreutils/template
@@ -15,4 +15,5 @@ long_desc="
  which are expected to exist on every operating system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
diff --git a/templates/dash/template b/templates/dash/template
index 64e9d9af6de..b2fbbd1197c 100644
--- a/templates/dash/template
+++ b/templates/dash/template
@@ -18,7 +18,8 @@ long_desc="
 
 base_package=yes
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
 
 post_install()
 {
diff --git a/templates/diffutils/template b/templates/diffutils/template
index 131d61d2be5..179bd94bc0e 100644
--- a/templates/diffutils/template
+++ b/templates/diffutils/template
@@ -12,5 +12,6 @@ long_desc="
  faster. Cmp has been moved into this package from the GNU textutils package.
  These programs are usually used for creating patch files."
 
-base_chroot=yes 
-run_depends="glibc-2.8"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/file-devel b/templates/file-devel
new file mode 120000
index 00000000000..1a010b1c0f0
--- /dev/null
+++ b/templates/file-devel
@@ -0,0 +1 @@
+file
\ No newline at end of file
diff --git a/templates/file/depends b/templates/file/depends
new file mode 100644
index 00000000000..6983d7570d4
--- /dev/null
+++ b/templates/file/depends
@@ -0,0 +1,2 @@
+abi_depends=4.90
+api_depends=${abi_depends}
diff --git a/templates/gmp/dev.template b/templates/file/devel.template
similarity index 52%
rename from templates/gmp/dev.template
rename to templates/file/devel.template
index 22ee246c3d3..976fc9d2d17 100644
--- a/templates/gmp/dev.template
+++ b/templates/file/devel.template
@@ -1,17 +1,18 @@
-# Template file for 'gmp-dev'.
+# Template file for 'file-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="gmp-libs-${version}"
+
+Add_dependency run file
 
 do_install()
 {
 	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
 	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libgmp.*a \
-		${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/libmagic.*a ${destdir}/usr/lib
 }
diff --git a/templates/file/template b/templates/file/template
index 1618471a298..92cfdc0ab3c 100644
--- a/templates/file/template
+++ b/templates/file/template
@@ -1,5 +1,6 @@
 # Template file for 'file'
 pkgname=file
+sourcepkg=file
 version=5.00
 distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -12,5 +13,7 @@ long_desc="
  a description if a match is found."
 
 base_chroot=yes
-build_depends="zlib-1.2.3"
-run_depends="glibc-2.8 zlib-1.2.3"
+subpackages="devel"
+
+Add_dependency run glibc
+Add_dependency full zlib
diff --git a/templates/findutils/template b/templates/findutils/template
index cb8d84216f7..365c950e3a8 100644
--- a/templates/findutils/template
+++ b/templates/findutils/template
@@ -16,4 +16,5 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
diff --git a/templates/gawk-base b/templates/gawk-base
deleted file mode 120000
index 7ef87eea4dd..00000000000
--- a/templates/gawk-base
+++ /dev/null
@@ -1 +0,0 @@
-gawk
\ No newline at end of file
diff --git a/templates/gawk-locale b/templates/gawk-locale
deleted file mode 120000
index 7ef87eea4dd..00000000000
--- a/templates/gawk-locale
+++ /dev/null
@@ -1 +0,0 @@
-gawk
\ No newline at end of file
diff --git a/templates/gawk/base.template b/templates/gawk/base.template
deleted file mode 100644
index 038fbd4fdd1..00000000000
--- a/templates/gawk/base.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gawk-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base files."
-run_depends="glibc-libs-2.8"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/usr/lib
-	mkdir -p ${destdir}/usr/share
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/libexec ${destdir}/usr
-	mv ${origdir}/usr/share/awk ${destdir}/usr/share
-	mv ${origdir}/usr/share/man ${destdir}/usr/share
-	mv ${origdir}/usr/share/info ${destdir}/usr/share
-}
diff --git a/templates/gawk/locale.template b/templates/gawk/locale.template
deleted file mode 100644
index a000cacf52c..00000000000
--- a/templates/gawk/locale.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gawk-locale'.
-#
-short_desc="${short_desc} (locales)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} locale files, for non US users."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}
diff --git a/templates/gawk/template b/templates/gawk/template
index 2640735b893..391e633a6a8 100644
--- a/templates/gawk/template
+++ b/templates/gawk/template
@@ -1,6 +1,5 @@
 # Template file for 'gawk'
 pkgname=gawk
-sourcepkg=gawk
 version=3.1.6
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -11,5 +10,6 @@ checksum=06dd872da7145088ae08475f7b11e5b9e810b8ead7d78d039003e671bb76ec65
 long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
-base_chroot=yes 
-subpackages="base locale"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/gcc-base b/templates/gcc-c++
similarity index 100%
rename from templates/gcc-base
rename to templates/gcc-c++
diff --git a/templates/gcc-dev b/templates/gcc-libgcc
similarity index 100%
rename from templates/gcc-dev
rename to templates/gcc-libgcc
diff --git a/templates/gcc-docs b/templates/gcc-libgomp
similarity index 100%
rename from templates/gcc-docs
rename to templates/gcc-libgomp
diff --git a/templates/gcc-locale b/templates/gcc-libmudflap
similarity index 100%
rename from templates/gcc-locale
rename to templates/gcc-libmudflap
diff --git a/templates/gcc-libmudflap-devel b/templates/gcc-libmudflap-devel
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-libmudflap-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-libobjc b/templates/gcc-libobjc
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-libobjc
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-libobjc-devel b/templates/gcc-libobjc-devel
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-libobjc-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-libstdc++ b/templates/gcc-libstdc++
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-libstdc++
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-libstdc++-devel b/templates/gcc-libstdc++-devel
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-libstdc++-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-objc b/templates/gcc-objc
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-objc
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc-objc++ b/templates/gcc-objc++
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-objc++
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc/base.template b/templates/gcc/base.template
deleted file mode 100644
index 7576be11fbb..00000000000
--- a/templates/gcc/base.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gcc-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and libraries."
-run_depends="glibc-libs-2.8 gmp-libs-4.2.4 mpfr-libs-2.3.2 binutils-2.18"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/libexec ${destdir}/usr
-	mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/lib*.spec ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu/${version} \
-		${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu
-}
diff --git a/templates/gcc/c++.template b/templates/gcc/c++.template
new file mode 100644
index 00000000000..47f15e5396d
--- /dev/null
+++ b/templates/gcc/c++.template
@@ -0,0 +1,35 @@
+# Template file for 'gcc-c++'.
+#
+short_desc="GCC C++ support"
+long_desc="${long_desc}
+
+ This package contains GCC C++ support."
+
+Add_dependency run gcc
+Add_dependency run gcc-libstdc++
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/bin
+	mkdir -p ${destdir}/usr/share/man/man1
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}
+
+	for f in g++ c++ ${triplet}-g++ ${triplet}-c++; do
+		mv ${origdir}/usr/bin/${f} ${destdir}/usr/bin
+	done
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1plus \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+
+	mv ${origdir}/usr/share/man/man1/g++.1 ${destdir}/usr/share/man/man1
+}
diff --git a/templates/gcc/depends b/templates/gcc/depends
new file mode 100644
index 00000000000..3cb595ff559
--- /dev/null
+++ b/templates/gcc/depends
@@ -0,0 +1,2 @@
+abi_depends=4.3.0
+api_depends=${abi_depends}
diff --git a/templates/gcc/dev.template b/templates/gcc/dev.template
deleted file mode 100644
index a5729bd23cd..00000000000
--- a/templates/gcc/dev.template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'gcc-dev'.
-#
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-run_depends="gcc-base-${version}"
-
-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
-
-	for f in mudflap mudflapth ssp_nonshared supc++ ssp stdc++ \
-		 objc gomp gcc_s; do
-		for ext in a la; do
-			if [ -f ${origdir}/usr/lib/lib${f}.${ext} ]; then
-				mv ${origdir}/usr/lib/lib${f}.${ext} ${destdir}/usr/lib
-			fi
-		done
-		if [ -f ${origdir}/usr/lib/lib${f}.so ]; then
-			mv ${origdir}/usr/lib/lib${f}.so ${destdir}/usr/lib
-		fi
-	done
-}
diff --git a/templates/gcc/docs.template b/templates/gcc/docs.template
deleted file mode 100644
index 0366099eece..00000000000
--- a/templates/gcc/docs.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'gcc-docs'.
-#
-short_desc="${short_desc} (documentation)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} documentation: manual pages
- and info files."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move manpages and info files.
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/man \
-		${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/info \
-		${destdir}/usr/share
-}
diff --git a/templates/gcc/libgcc.template b/templates/gcc/libgcc.template
new file mode 100644
index 00000000000..176ea963b10
--- /dev/null
+++ b/templates/gcc/libgcc.template
@@ -0,0 +1,15 @@
+# Template file for 'gcc-libgcc'.
+#
+short_desc="GCC version ${version} shared library support"
+long_desc="${long_desc}
+
+ This package contains the GCC shared library."
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libgcc_s.so* ${destdir}/usr/lib
+}
diff --git a/templates/gcc/libgomp.template b/templates/gcc/libgomp.template
new file mode 100644
index 00000000000..5d2956f76ad
--- /dev/null
+++ b/templates/gcc/libgomp.template
@@ -0,0 +1,22 @@
+# Template file for 'gcc-libgomp'.
+#
+short_desc="GCC OpenMP v3.0 shared support library"
+long_desc="${long_desc}
+
+ This package contains GCC shared support library which is needed
+ for OpenMP v3.0 support."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share
+
+	mv ${origdir}/usr/lib/libgomp.* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}
diff --git a/templates/gcc/libmudflap-devel.template b/templates/gcc/libmudflap-devel.template
new file mode 100644
index 00000000000..aed30e3b697
--- /dev/null
+++ b/templates/gcc/libmudflap-devel.template
@@ -0,0 +1,19 @@
+# Template file for 'gcc-libmudflap-devel'.
+#
+short_desc="GCC mudflap shared support library (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC mudflap headers and static libraries for
+ building mudflap-instrumented programs."
+
+Add_dependency run gcc-libmudflap
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.so ${destdir}/usr/lib
+}
diff --git a/templates/gcc/libmudflap.template b/templates/gcc/libmudflap.template
new file mode 100644
index 00000000000..38077c27ca8
--- /dev/null
+++ b/templates/gcc/libmudflap.template
@@ -0,0 +1,19 @@
+# Template file for 'gcc-libmudflap'.
+#
+short_desc="GCC mudflap shared support library"
+long_desc="${long_desc}
+
+ This package contains GCC shared support library which is needed
+ for mudflap support."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libmudflap*.so.* ${destdir}/usr/lib
+}
diff --git a/templates/gcc/libobjc-devel.template b/templates/gcc/libobjc-devel.template
new file mode 100644
index 00000000000..3fb20137e9b
--- /dev/null
+++ b/templates/gcc/libobjc-devel.template
@@ -0,0 +1,19 @@
+# Template file for 'gcc-libobjc-devel'.
+#
+short_desc="GCC Objective-C shared library support (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C headers and static libs, to
+ build Objective-C programs."
+
+Add_dependency run gcc-libobjc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.so ${destdir}/usr/lib
+}
diff --git a/templates/gcc/libobjc.template b/templates/gcc/libobjc.template
new file mode 100644
index 00000000000..ecdf6b62af2
--- /dev/null
+++ b/templates/gcc/libobjc.template
@@ -0,0 +1,19 @@
+# Template file for 'gcc-libobjc'.
+#
+short_desc="GCC Objective-C shared library support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C shared support library which is needed
+ to run Objective-C dynamically linked programs."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libobjc.so.* ${destdir}/usr/lib
+}
diff --git a/templates/gcc/libstdc++-devel.template b/templates/gcc/libstdc++-devel.template
new file mode 100644
index 00000000000..d43c670a2dd
--- /dev/null
+++ b/templates/gcc/libstdc++-devel.template
@@ -0,0 +1,23 @@
+# Template file for 'gcc-libstdc++-devel'.
+#
+short_desc="GCC Standard C++ Library (development files)"
+long_desc="${long_desc}
+
+ This package contains GCC Header files and libraries for
+ C++ development."
+
+Add_dependency run gcc-libstdc++
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/include
+
+	mv ${origdir}/usr/lib/libstdc++.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libstdc++.so ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libsupc++.* ${destdir}/usr/lib
+	mv ${origdir}/usr/include/c++ ${destdir}/usr/include
+}
diff --git a/templates/gcc/libstdc++.template b/templates/gcc/libstdc++.template
new file mode 100644
index 00000000000..380e044b264
--- /dev/null
+++ b/templates/gcc/libstdc++.template
@@ -0,0 +1,26 @@
+# Template file for 'gcc-libstdc++'.
+#
+short_desc="GCC Standard C++ Library"
+long_desc="${long_desc}
+
+ This package contains a rewritten standard compliant GCC Standard
+ C++ library."
+
+Add_dependency run glibc
+Add_dependency run gcc-libgcc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share/locale/fr/LC_MESSAGES
+	mkdir -p ${destdir}/usr/share/locale/de/LC_MESSAGES
+
+	mv ${origdir}/usr/lib/libstdc++.so.* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
+		${destdir}/usr/share/locale/fr/LC_MESSAGES
+	mv ${origdir}/usr/share/locale/de/LC_MESSAGES/libstdc++.mo \
+		${destdir}/usr/share/locale/de/LC_MESSAGES
+}
diff --git a/templates/gcc/locale.template b/templates/gcc/locale.template
deleted file mode 100644
index c214ee783a3..00000000000
--- a/templates/gcc/locale.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gcc-locale'.
-#
-short_desc="${short_desc} (locales)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} locale files, for non US users."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	mkdir -p ${destdir}/usr/share
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share/locale \
-		${destdir}/usr/share
-}
diff --git a/templates/gcc/objc++.template b/templates/gcc/objc++.template
new file mode 100644
index 00000000000..35c4d7b60da
--- /dev/null
+++ b/templates/gcc/objc++.template
@@ -0,0 +1,28 @@
+# Template file for 'gcc-objc++'.
+#
+short_desc="GCC Objective-C++ support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C++ support."
+
+Add_dependency run gmp
+Add_dependency run mpfr
+Add_dependency run gcc-c++
+Add_dependency run gcc-objc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1objplus \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+}
diff --git a/templates/gcc/objc.template b/templates/gcc/objc.template
new file mode 100644
index 00000000000..5f3d79de425
--- /dev/null
+++ b/templates/gcc/objc.template
@@ -0,0 +1,32 @@
+# Template file for 'gcc-objc'.
+#
+short_desc="GCC Objective-C support"
+long_desc="${long_desc}
+
+ This package contains GCC Objective-C support."
+
+Add_dependency run gmp
+Add_dependency run mpfr
+Add_dependency run gcc
+Add_dependency run gcc-libobjc
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${destdir}//usr/lib/gcc/${triplet}/${version}
+	mkdir -p ${destdir}/usr/libexec/gcc/${triplet}/${version}/include
+
+	mv ${origdir}/usr/lib/gcc/${triplet}/${version}/include/objc \
+		${destdir}/usr/lib/gcc/${triplet}/${version}/include
+	mv ${origdir}/usr/libexec/gcc/${triplet}/${version}/cc1obj \
+		${destdir}/usr/libexec/gcc/${triplet}/${version}
+}
diff --git a/templates/gcc/template b/templates/gcc/template
index ef28e2ea3cd..aa45aea3670 100644
--- a/templates/gcc/template
+++ b/templates/gcc/template
@@ -19,8 +19,16 @@ long_desc="
  The GNU C Compiler suite, with support for C, C++, Fortran, ObjC."
 
 base_chroot=yes
-build_depends="gmp-4.2.4 mpfr-2.3.2 binutils-2.18"
-subpackages="base dev docs locale"
+subpackages="libgcc libstdc++ libstdc++-devel libgomp libmudflap"
+subpackages="${subpackages} libmudflap-devel libobjc libobjc-devel"
+subpackages="${subpackages} c++ objc objc++"
+
+Add_dependency full	gmp
+Add_dependency full	mpfr
+Add_dependency full	binutils
+Add_dependency run	gcc-libgcc
+Add_dependency run	gcc-libgomp
+Add_dependency run	glibc-devel
 
 # As specified in the LFS book, disable installing libiberty.
 pre_configure()
@@ -28,8 +36,9 @@ pre_configure()
 	sed -i 's/install_to_$(INSTALL_DEST) //' $wrksrc/libiberty/Makefile.in
 }
 
-# Make /usr/bin/gcc -> /usr/bin/cc symlink.
 post_install()
 {
-	cd $XBPS_DESTDIR/$pkgname-$version/usr/bin && ln -s gcc cc
+	local destdir=$XBPS_DESTDIR/$pkgname-$version
+
+	cd $destdir/usr/bin && ln -s gcc cc
 }
diff --git a/templates/glibc-base b/templates/glibc-devel
similarity index 100%
rename from templates/glibc-base
rename to templates/glibc-devel
diff --git a/templates/glibc-libs b/templates/glibc-libs
deleted file mode 120000
index 0c4c137d7ca..00000000000
--- a/templates/glibc-libs
+++ /dev/null
@@ -1 +0,0 @@
-glibc
\ No newline at end of file
diff --git a/templates/glibc-locale b/templates/glibc-locale
deleted file mode 120000
index 0c4c137d7ca..00000000000
--- a/templates/glibc-locale
+++ /dev/null
@@ -1 +0,0 @@
-glibc
\ No newline at end of file
diff --git a/templates/glibc-dev b/templates/glibc-locales
similarity index 100%
rename from templates/glibc-dev
rename to templates/glibc-locales
diff --git a/templates/glibc/base.template b/templates/glibc/base.template
deleted file mode 100644
index 747c690fb54..00000000000
--- a/templates/glibc/base.template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'glibc-base'.
-#
-short_desc="${short_desc} (base files)"
-long_desc="${long_desc}
-
- This package contains the ${sourcepkg} base programs and libraries."
-
-conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
- /etc/nsswitch.conf"
-run_depends="glibc-libs-${version}"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/usr/lib
-	mv ${origdir}/etc ${destdir}
-	mv ${origdir}/sbin ${destdir}
-	mv ${origdir}/usr/bin ${destdir}/usr
-	mv ${origdir}/usr/sbin ${destdir}/usr
-	mv ${origdir}/usr/lib/getconf ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/pt_chown ${destdir}/usr/lib
-}
diff --git a/templates/glibc/depends b/templates/glibc/depends
new file mode 100644
index 00000000000..2bdfdafe52d
--- /dev/null
+++ b/templates/glibc/depends
@@ -0,0 +1,2 @@
+abi_depends=2.8
+api_depends=${abi_depends}
diff --git a/templates/glibc/devel.template b/templates/glibc/devel.template
new file mode 100644
index 00000000000..53b3c4a63a0
--- /dev/null
+++ b/templates/glibc/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'glibc-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run glibc
+
+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
+	mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/*crt1.o ${destdir}/usr/lib
+}
diff --git a/templates/glibc/libs.template b/templates/glibc/libs.template
deleted file mode 100644
index d4c0bd06f77..00000000000
--- a/templates/glibc/libs.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'glibc-libs'.
-#
-short_desc="${short_desc} (libraries)"
-long_desc="${long_desc}
-
- This package contains only the ${sourcepkg} shared libraries."
-run_depends="xbps-base-dirs-1.0"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
-
-	mkdir -p ${destdir}/lib
-	mkdir -p ${destdir}/usr/lib
-	mv ${origdir}/lib/*.*o* ${destdir}/lib
-	mv ${origdir}/usr/lib/*.*o* ${destdir}/usr/lib
-	mv ${origdir}/usr/lib/gconv ${destdir}/usr/lib
-}
diff --git a/templates/glibc/locale.template b/templates/glibc/locales.template
similarity index 89%
rename from templates/glibc/locale.template
rename to templates/glibc/locales.template
index 8ecc9d6bcea..ad3cea4b87f 100644
--- a/templates/glibc/locale.template
+++ b/templates/glibc/locales.template
@@ -1,10 +1,9 @@
-# Template file for 'glibc-locale'.
+# Template file for 'glibc-locales'.
 #
 short_desc="${short_desc} (locales)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
-run_depends=
 noarch=yes
 
 do_install()
diff --git a/templates/glibc/template b/templates/glibc/template
index 0393d4cd912..317370db1fb 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -23,8 +23,12 @@ long_desc="
  languages use the C library to access the underlying operating system."
 
 base_chroot=yes
-build_depends="gcc-4.3.2 gawk-3.1.6"
-subpackages="base dev libs locale"
+subpackages="devel locales"
+
+Add_dependency build	gcc
+Add_dependency build	gawk
+Add_dependency run	gcc-libgcc
+Add_dependency run	glibc-locales
 
 pre_configure()
 {
diff --git a/templates/gmp-dev b/templates/gmp-devel
similarity index 100%
rename from templates/gmp-dev
rename to templates/gmp-devel
diff --git a/templates/gmp-libs b/templates/gmp-libs
deleted file mode 120000
index eeaa9d938de..00000000000
--- a/templates/gmp-libs
+++ /dev/null
@@ -1 +0,0 @@
-gmp
\ No newline at end of file
diff --git a/templates/gmp/depends b/templates/gmp/depends
new file mode 100644
index 00000000000..300b32091e0
--- /dev/null
+++ b/templates/gmp/depends
@@ -0,0 +1,2 @@
+abi_depends=4.2.2
+api_depends=${abi_depends}
diff --git a/templates/gmp/devel.template b/templates/gmp/devel.template
new file mode 100644
index 00000000000..e02accd30ea
--- /dev/null
+++ b/templates/gmp/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'gmp-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run gmp
+
+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/libgmp.*a ${destdir}/usr/lib
+}
diff --git a/templates/gmp/libs.template b/templates/gmp/libs.template
deleted file mode 100644
index ea37934cac3..00000000000
--- a/templates/gmp/libs.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'gmp-libs'.
-#
-short_desc="${short_desc} (libraries)"
-long_desc="${long_desc}
-
- This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move the shared lib.
-	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libgmp.so* \
-		${destdir}/usr/lib
-}
diff --git a/templates/gmp/template b/templates/gmp/template
index 415ae0ce0ff..a7aa2e7c0a7 100644
--- a/templates/gmp/template
+++ b/templates/gmp/template
@@ -24,7 +24,9 @@ long_desc="
  operations, since GNU MP in many cases has asymptotically faster algorithms."
 
 base_chroot=yes
-subpackages="dev libs"
+subpackages="devel"
+
+Add_dependency run glibc
 
 pre_configure()
 {
diff --git a/templates/grep/template b/templates/grep/template
index 3496fe38377..849a27d9984 100644
--- a/templates/grep/template
+++ b/templates/grep/template
@@ -16,5 +16,6 @@ long_desc="
  The result is typically many times faster than Unix grep or egrep."
 
 base_chroot=yes
-build_depends="texinfo-4.13a"
-run_depends="glibc-2.8"
+
+Add_dependency build texinfo
+Add_dependency run glibc
diff --git a/templates/gzip/template b/templates/gzip/template
index 01091613573..b801db41085 100644
--- a/templates/gzip/template
+++ b/templates/gzip/template
@@ -13,4 +13,5 @@ long_desc="
  standard compression program for its system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
diff --git a/templates/libarchive-devel b/templates/libarchive-devel
new file mode 120000
index 00000000000..6e93d9cc1c0
--- /dev/null
+++ b/templates/libarchive-devel
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/templates/libarchive/depends b/templates/libarchive/depends
new file mode 100644
index 00000000000..003c94e8c9b
--- /dev/null
+++ b/templates/libarchive/depends
@@ -0,0 +1,2 @@
+abi_depends=2.6.0
+api_depends=${abi_depends}
diff --git a/templates/mpfr/dev.template b/templates/libarchive/devel.template
similarity index 52%
rename from templates/mpfr/dev.template
rename to templates/libarchive/devel.template
index 755d5d59f4f..3d0026169d5 100644
--- a/templates/mpfr/dev.template
+++ b/templates/libarchive/devel.template
@@ -1,17 +1,18 @@
-# Template file for 'mpfr-dev'.
+# Template file for 'libarchive-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="mpfr-libs-${version}"
+
+Add_dependency run libarchive
 
 do_install()
 {
 	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
 	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.*a \
-		${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/libarchive.*a ${destdir}/usr/lib
 }
diff --git a/templates/libarchive/template b/templates/libarchive/template
index 18308ce9d89..b6569113f04 100644
--- a/templates/libarchive/template
+++ b/templates/libarchive/template
@@ -1,10 +1,9 @@
 # Template file for 'libarchive'
 pkgname=libarchive
+sourcepkg=libarchive
 version=2.6.1
 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args=" --disable-bsdcpio --disable-bsdtar --disable-xattr
- --disable-acl"
 short_desc="Library to read/write tar, cpio, pax, zip, iso9660, etc."
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179
@@ -15,5 +14,8 @@ long_desc="
  shar archives and read ISO9660 CDROM images and ZIP archives."
 
 base_chroot=yes 
-build_depends="gzip-1.3.12 bzip2-1.0.5 zlib-1.2.3 lzma-utils-4.32.7"
-run_depends="glibc-2.8 $build_depends"
+subpackages="devel"
+
+Add_dependency full bzip2
+Add_dependency full lzma-utils-libs
+Add_dependency full zlib
diff --git a/templates/lzma-utils-devel b/templates/lzma-utils-devel
new file mode 120000
index 00000000000..2be97a1091e
--- /dev/null
+++ b/templates/lzma-utils-devel
@@ -0,0 +1 @@
+lzma-utils
\ No newline at end of file
diff --git a/templates/lzma-utils-libs b/templates/lzma-utils-libs
new file mode 120000
index 00000000000..2be97a1091e
--- /dev/null
+++ b/templates/lzma-utils-libs
@@ -0,0 +1 @@
+lzma-utils
\ No newline at end of file
diff --git a/templates/lzma-utils/depends b/templates/lzma-utils/depends
new file mode 100644
index 00000000000..810076ebeae
--- /dev/null
+++ b/templates/lzma-utils/depends
@@ -0,0 +1,2 @@
+abi_depends=4.32
+api_depends=${abi_depends}
diff --git a/templates/proplib/dev.template b/templates/lzma-utils/devel.template
similarity index 52%
rename from templates/proplib/dev.template
rename to templates/lzma-utils/devel.template
index ba7993ccd36..cf3e93abcbe 100644
--- a/templates/proplib/dev.template
+++ b/templates/lzma-utils/devel.template
@@ -1,17 +1,18 @@
-# Template file for 'proplib-dev'.
+# Template file for 'lzma-utils-devel'.
 #
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="proplib-libs-${version}"
+
+Add_dependency run lzma-utils-libs
 
 do_install()
 {
 	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
 	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/include ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libprop.*a \
-		${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/liblzmadec.*a ${destdir}/usr/lib
 }
diff --git a/templates/lzma-utils/libs.template b/templates/lzma-utils/libs.template
new file mode 100644
index 00000000000..a3fa1eafe24
--- /dev/null
+++ b/templates/lzma-utils/libs.template
@@ -0,0 +1,18 @@
+# Template file for 'lzma-utils-libs'.
+#
+short_desc="${short_desc} (shared libraries)"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+Add_dependency run glibc
+Add_dependency run gcc-libstdc++
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/liblzmadec.so.* ${destdir}/usr/lib
+}
diff --git a/templates/lzma-utils/template b/templates/lzma-utils/template
index 2d26779fb31..cb356d3396d 100644
--- a/templates/lzma-utils/template
+++ b/templates/lzma-utils/template
@@ -1,5 +1,6 @@
 # Template file for 'lzma-utils'
 pkgname=lzma-utils
+sourcepkg=lzma-utils
 version=4.32.7
 wrksrc="lzma-$version"
 distfiles="http://tukaani.org/lzma/lzma-$version.tar.gz"
@@ -13,4 +14,7 @@ long_desc="
  bzip2 utilities."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="devel libs"
+
+Add_dependency run glibc
+Add_dependency run gcc-libstdc++
diff --git a/templates/make/template b/templates/make/template
index 5ed5fa1a5bb..40ebee43c5a 100644
--- a/templates/make/template
+++ b/templates/make/template
@@ -12,4 +12,5 @@ long_desc="
  recompile them, when necessary."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+
+Add_dependency run glibc
diff --git a/templates/mpfr-dev b/templates/mpfr-devel
similarity index 100%
rename from templates/mpfr-dev
rename to templates/mpfr-devel
diff --git a/templates/mpfr-libs b/templates/mpfr-libs
deleted file mode 120000
index 88fad384173..00000000000
--- a/templates/mpfr-libs
+++ /dev/null
@@ -1 +0,0 @@
-mpfr
\ No newline at end of file
diff --git a/templates/mpfr/depends b/templates/mpfr/depends
new file mode 100644
index 00000000000..810ac15e6c1
--- /dev/null
+++ b/templates/mpfr/depends
@@ -0,0 +1,2 @@
+abi_depends=2.4.0
+api_depends=${abi_depends}
diff --git a/templates/mpfr/devel.template b/templates/mpfr/devel.template
new file mode 100644
index 00000000000..d0ce5a7862c
--- /dev/null
+++ b/templates/mpfr/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'mpfr-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run mpfr
+
+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/libmpfr.*a ${destdir}/usr/lib
+}
diff --git a/templates/mpfr/libs.template b/templates/mpfr/libs.template
deleted file mode 100644
index 2e1105bd820..00000000000
--- a/templates/mpfr/libs.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'mpfr-libs'.
-#
-short_desc="${short_desc} (libraries)"
-long_desc="${long_desc}
-
- This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8 gmp-libs-4.2.4"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move the shared lib.
-	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libmpfr.so* \
-		${destdir}/usr/lib
-}
diff --git a/templates/mpfr/template b/templates/mpfr/template
index 2c4c9d6576c..32a90beab58 100644
--- a/templates/mpfr/template
+++ b/templates/mpfr/template
@@ -17,5 +17,6 @@ long_desc="
  library."
 
 base_chroot=yes
-build_depends="gmp-4.2.4"
-subpackages="dev libs"
+subpackages="devel"
+
+Add_dependency full gmp
diff --git a/templates/ncurses-base b/templates/ncurses-base
new file mode 120000
index 00000000000..ebb49ce34fe
--- /dev/null
+++ b/templates/ncurses-base
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses-devel b/templates/ncurses-devel
new file mode 120000
index 00000000000..ebb49ce34fe
--- /dev/null
+++ b/templates/ncurses-devel
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses-libs b/templates/ncurses-libs
new file mode 120000
index 00000000000..ebb49ce34fe
--- /dev/null
+++ b/templates/ncurses-libs
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses-term b/templates/ncurses-term
new file mode 120000
index 00000000000..ebb49ce34fe
--- /dev/null
+++ b/templates/ncurses-term
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses/base-files b/templates/ncurses/base-files
new file mode 100644
index 00000000000..431990cbd73
--- /dev/null
+++ b/templates/ncurses/base-files
@@ -0,0 +1,136 @@
+/usr/share/tabset
+/usr/share/tabset/std
+/usr/share/tabset/stdcrt
+/usr/share/tabset/vt100
+/usr/share/tabset/vt300
+/usr/share/terminfo
+/usr/share/terminfo/A
+/usr/share/terminfo/A/Apple_Terminal
+/usr/share/terminfo/E
+/usr/share/terminfo/E/Eterm
+/usr/share/terminfo/E/Eterm-256color
+/usr/share/terminfo/E/Eterm-88color
+/usr/share/terminfo/E/Eterm-color
+/usr/share/terminfo/a
+/usr/share/terminfo/a/ansi
+/usr/share/terminfo/a/ansi80x25
+/usr/share/terminfo/a/ansis
+/usr/share/terminfo/c
+/usr/share/terminfo/c/cons25
+/usr/share/terminfo/c/cygwin
+/usr/share/terminfo/d
+/usr/share/terminfo/d/dumb
+/usr/share/terminfo/g
+/usr/share/terminfo/g/gnome
+/usr/share/terminfo/g/gnome-2007
+/usr/share/terminfo/g/gnome-256color
+/usr/share/terminfo/g/gnome-fc5
+/usr/share/terminfo/g/gnome-rh62
+/usr/share/terminfo/g/gnome-rh72
+/usr/share/terminfo/g/gnome-rh80
+/usr/share/terminfo/g/gnome-rh90
+/usr/share/terminfo/h
+/usr/share/terminfo/h/hurd
+/usr/share/terminfo/j
+/usr/share/terminfo/j/jfbterm
+/usr/share/terminfo/k
+/usr/share/terminfo/k/kon
+/usr/share/terminfo/k/kon2
+/usr/share/terminfo/l
+/usr/share/terminfo/l/linux
+/usr/share/terminfo/m
+/usr/share/terminfo/m/mach
+/usr/share/terminfo/m/mach-bold
+/usr/share/terminfo/m/mach-color
+/usr/share/terminfo/m/mlterm
+/usr/share/terminfo/m/mrxvt
+/usr/share/terminfo/n
+/usr/share/terminfo/n/nsterm
+/usr/share/terminfo/n/nxterm
+/usr/share/terminfo/p
+/usr/share/terminfo/p/pcansi
+/usr/share/terminfo/p/putty
+/usr/share/terminfo/p/putty-256color
+/usr/share/terminfo/p/putty-vt100
+/usr/share/terminfo/r
+/usr/share/terminfo/r/rxvt
+/usr/share/terminfo/r/rxvt-16color
+/usr/share/terminfo/r/rxvt-256color
+/usr/share/terminfo/r/rxvt-88color
+/usr/share/terminfo/r/rxvt-basic
+/usr/share/terminfo/r/rxvt-color
+/usr/share/terminfo/r/rxvt-cygwin
+/usr/share/terminfo/r/rxvt-cygwin-native
+/usr/share/terminfo/r/rxvt-unicode
+/usr/share/terminfo/r/rxvt-xpm
+/usr/share/terminfo/s
+/usr/share/terminfo/s/screen
+/usr/share/terminfo/s/screen-16color
+/usr/share/terminfo/s/screen-16color-bce
+/usr/share/terminfo/s/screen-16color-bce-s
+/usr/share/terminfo/s/screen-16color-s
+/usr/share/terminfo/s/screen-256color
+/usr/share/terminfo/s/screen-256color-bce
+/usr/share/terminfo/s/screen-256color-bce-s
+/usr/share/terminfo/s/screen-256color-s
+/usr/share/terminfo/s/screen-bce
+/usr/share/terminfo/s/screen-s
+/usr/share/terminfo/s/screen-w
+/usr/share/terminfo/s/screen.linux
+/usr/share/terminfo/s/screen.mlterm
+/usr/share/terminfo/s/screen.rxvt
+/usr/share/terminfo/s/screen.teraterm
+/usr/share/terminfo/s/screen.xterm-new
+/usr/share/terminfo/s/screen.xterm-r6
+/usr/share/terminfo/s/screen.xterm-xfree86
+/usr/share/terminfo/s/sun
+/usr/share/terminfo/s/sun1
+/usr/share/terminfo/s/sun2
+/usr/share/terminfo/t
+/usr/share/terminfo/t/teraterm
+/usr/share/terminfo/v
+/usr/share/terminfo/v/vs100
+/usr/share/terminfo/v/vt100
+/usr/share/terminfo/v/vt100-am
+/usr/share/terminfo/v/vt100-nav
+/usr/share/terminfo/v/vt102
+/usr/share/terminfo/v/vt200
+/usr/share/terminfo/v/vt220
+/usr/share/terminfo/v/vt52
+/usr/share/terminfo/w
+/usr/share/terminfo/w/wsvt25
+/usr/share/terminfo/w/wsvt25m
+/usr/share/terminfo/x
+/usr/share/terminfo/x/xfce
+/usr/share/terminfo/x/xterm
+/usr/share/terminfo/x/xterm-1002
+/usr/share/terminfo/x/xterm-1003
+/usr/share/terminfo/x/xterm-16color
+/usr/share/terminfo/x/xterm-24
+/usr/share/terminfo/x/xterm-256color
+/usr/share/terminfo/x/xterm-88color
+/usr/share/terminfo/x/xterm-8bit
+/usr/share/terminfo/x/xterm-basic
+/usr/share/terminfo/x/xterm-bold
+/usr/share/terminfo/x/xterm-color
+/usr/share/terminfo/x/xterm-hp
+/usr/share/terminfo/x/xterm-new
+/usr/share/terminfo/x/xterm-nic
+/usr/share/terminfo/x/xterm-noapp
+/usr/share/terminfo/x/xterm-old
+/usr/share/terminfo/x/xterm-pcolor
+/usr/share/terminfo/x/xterm-r5
+/usr/share/terminfo/x/xterm-r6
+/usr/share/terminfo/x/xterm-sco
+/usr/share/terminfo/x/xterm-sun
+/usr/share/terminfo/x/xterm-vt220
+/usr/share/terminfo/x/xterm-vt52
+/usr/share/terminfo/x/xterm-xf86-v32
+/usr/share/terminfo/x/xterm-xf86-v33
+/usr/share/terminfo/x/xterm-xf86-v333
+/usr/share/terminfo/x/xterm-xf86-v40
+/usr/share/terminfo/x/xterm-xf86-v43
+/usr/share/terminfo/x/xterm-xf86-v44
+/usr/share/terminfo/x/xterm-xfree86
+/usr/share/terminfo/x/xterm-xi
+/usr/share/terminfo/x/xterms
diff --git a/templates/ncurses/base.template b/templates/ncurses/base.template
new file mode 100644
index 00000000000..fdfb97fd246
--- /dev/null
+++ b/templates/ncurses/base.template
@@ -0,0 +1,30 @@
+# Template file for 'ncurses-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the base files."
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do
+		if [ -f ${origdir}/${line} ]; then
+			install -D ${origdir}/${line} ${destdir}/${line}
+			rm -f ${origdir}/${line}
+		fi
+	done
+
+	mkdir -p ${destdir}/lib/terminfo/a
+	mkdir -p ${destdir}/lib/terminfo/l
+	mkdir -p ${destdir}/lib/terminfo/v
+
+	cp ${destdir}/usr/share/terminfo/a/ansi ${destdir}/lib/terminfo/a
+	cp ${destdir}/usr/share/terminfo/l/linux ${destdir}/lib/terminfo/l
+	for f in vt100 vt100-am vt100-nav vt102 vt200 vt220 vt52; do
+		cp ${destdir}/usr/share/terminfo/v/${f} \
+			${destdir}/lib/terminfo/v
+	done
+}
diff --git a/templates/ncurses/depends b/templates/ncurses/depends
new file mode 100644
index 00000000000..745af2f3ddf
--- /dev/null
+++ b/templates/ncurses/depends
@@ -0,0 +1,2 @@
+abi_depends=5.6
+api_depends=${abi_depends}
diff --git a/templates/ncurses/devel.template b/templates/ncurses/devel.template
new file mode 100644
index 00000000000..87be93a3588
--- /dev/null
+++ b/templates/ncurses/devel.template
@@ -0,0 +1,24 @@
+# Template file for 'ncurses-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run ncurses
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/bin
+	mkdir -p ${destdir}/usr/share/man
+
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/lib*.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/lib*.so ${destdir}/usr/lib
+	mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man
+	mv ${origdir}/usr/bin/ncurses5* ${destdir}/usr/bin
+}
diff --git a/templates/ncurses/libs.template b/templates/ncurses/libs.template
new file mode 100644
index 00000000000..64b05e28154
--- /dev/null
+++ b/templates/ncurses/libs.template
@@ -0,0 +1,22 @@
+# Template file for 'ncurses-libs'.
+#
+short_desc="${short_desc} (shared libraries)"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+Add_dependency run glibc
+Add_dependency run ncurses-base
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/lib
+	mkdir -p ${destdir}/usr/lib
+
+	mv ${origdir}/usr/lib/libcurses.so* ${destdir}/lib
+	mv ${origdir}/usr/lib/libncurses.so* ${destdir}/lib
+	mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib
+}
diff --git a/templates/ncurses/template b/templates/ncurses/template
index 096ae1893d8..00893f20cac 100644
--- a/templates/ncurses/template
+++ b/templates/ncurses/template
@@ -1,9 +1,10 @@
 # Template build file for 'ncurses'.
 pkgname=ncurses
+sourcepkg=ncurses
 version=5.7
 distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--with-shared"
+configure_args="--with-shared --without-debug"
 make_install_args="ticdir=$XBPS_DESTDIR/$pkgname-$version/usr/share/terminfo"
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -17,4 +18,8 @@ long_desc="
  ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
  Full manual pages are provided for the library and tools."
 
-run_depends="glibc-2.8"
+base_chroot=yes
+subpackages="base devel libs term"
+
+Add_dependency run glibc
+Add_dependency run ncurses-libs
diff --git a/templates/ncurses/term.template b/templates/ncurses/term.template
new file mode 100644
index 00000000000..bde89fb087d
--- /dev/null
+++ b/templates/ncurses/term.template
@@ -0,0 +1,19 @@
+# Template file for 'ncurses-term'.
+#
+short_desc="${short_desc} (terminal descriptions)"
+long_desc="${long_desc}
+
+ This package contains all available terminal descriptions."
+
+Add_dependency run ncurses-base
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+
+	mv ${origdir}/usr/share/tabset ${destdir}/usr/share
+	mv ${origdir}/usr/share/terminfo ${destdir}/usr/share
+}
diff --git a/templates/patch/template b/templates/patch/template
index 90564352c1b..5441e00fc52 100644
--- a/templates/patch/template
+++ b/templates/patch/template
@@ -13,5 +13,6 @@ long_desc="
 
  This is the GPL version from the Free Software Foundation."
 
-base_chroot=yes 
-run_depends="glibc-2.8"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/proplib-dev b/templates/proplib-devel
similarity index 100%
rename from templates/proplib-dev
rename to templates/proplib-devel
diff --git a/templates/proplib-docs b/templates/proplib-docs
deleted file mode 120000
index 3941a52d058..00000000000
--- a/templates/proplib-docs
+++ /dev/null
@@ -1 +0,0 @@
-proplib
\ No newline at end of file
diff --git a/templates/proplib-libs b/templates/proplib-libs
deleted file mode 120000
index 3941a52d058..00000000000
--- a/templates/proplib-libs
+++ /dev/null
@@ -1 +0,0 @@
-proplib
\ No newline at end of file
diff --git a/templates/proplib/depends b/templates/proplib/depends
new file mode 100644
index 00000000000..7bbc10b5bad
--- /dev/null
+++ b/templates/proplib/depends
@@ -0,0 +1,2 @@
+abi_depends=0.1
+api_depends=${abi_depends}
diff --git a/templates/proplib/devel.template b/templates/proplib/devel.template
new file mode 100644
index 00000000000..4683ef4e6cf
--- /dev/null
+++ b/templates/proplib/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'proplib-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run proplib
+
+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/libprop.*a ${destdir}/usr/lib
+}
diff --git a/templates/proplib/docs.template b/templates/proplib/docs.template
deleted file mode 100644
index d1e685ad220..00000000000
--- a/templates/proplib/docs.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'proplib-docs'.
-#
-short_desc="${short_desc} (documentation)"
-long_desc="${long_desc}
-
- This package contains the manual pages."
-run_depends=
-noarch=yes
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move manpages.
-	mkdir -p ${destdir}/usr
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/share ${destdir}/usr
-}
diff --git a/templates/proplib/libs.template b/templates/proplib/libs.template
deleted file mode 100644
index d7a31fd64b9..00000000000
--- a/templates/proplib/libs.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'proplib-libs'.
-#
-short_desc="${short_desc} (libraries)"
-long_desc="${long_desc}
-
- This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8"
-
-do_install()
-{
-	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
-
-	# Move the shared lib.
-	mkdir -p ${destdir}/usr/lib
-	mv ${XBPS_DESTDIR}/${sourcepkg}-${version}/usr/lib/libprop.so* \
-		${destdir}/usr/lib
-}
diff --git a/templates/proplib/template b/templates/proplib/template
index ffc5901bf99..dd238cc6150 100644
--- a/templates/proplib/template
+++ b/templates/proplib/template
@@ -24,4 +24,6 @@ long_desc="
  been converted to be built through the GNU autotools."
 
 base_chroot=yes
-subpackages="dev docs libs"
+subpackages="devel"
+
+Add_dependency run glibc
diff --git a/templates/sed/template b/templates/sed/template
index ed5ca4349c2..3c9d30981ed 100644
--- a/templates/sed/template
+++ b/templates/sed/template
@@ -11,5 +11,6 @@ long_desc="
  Sed, the GNU Stream Editor, copies the named files (standard input default)
  to the standard output, edited according to a script of commands."
 
-base_chroot=yes 
-run_depends="glibc-2.8"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/tar/template b/templates/tar/template
index d85184073e2..3bcd8350697 100644
--- a/templates/tar/template
+++ b/templates/tar/template
@@ -1,5 +1,6 @@
 # Template build file for 'tar'.
 pkgname=tar
+sourcepkg=tar
 version=1.20
 distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -14,3 +15,4 @@ long_desc="
  does not create "correct" ustar archives."
 
 base_chroot=yes
+build_depends="gzip-1.3.12 bzip2-1.0.5"
diff --git a/templates/texinfo/template b/templates/texinfo/template
index cbef12c1241..6485819b8c2 100644
--- a/templates/texinfo/template
+++ b/templates/texinfo/template
@@ -13,5 +13,6 @@ long_desc="
  on Brian Reid's Scribe and other formatting languages of the time. It is
  used by many non-GNU projects as well."
 
-base_chroot=yes 
-run_depends="glibc-2.8"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/wget/template b/templates/wget/template
index 4a971baf707..63d03279a26 100644
--- a/templates/wget/template
+++ b/templates/wget/template
@@ -29,8 +29,6 @@ long_desc="
       re-downloaded when mirroring
     * GNU Wget is distributed under the GNU General Public License."
 
-conf_files="/etc/wgetrc"
-base_chroot=yes 
-run_depends="glibc-2.8"
-# TODO : Add openssl dependency
-# openssl"
+base_chroot=yes
+
+Add_dependency run glibc
diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template
index a074a984760..d2878607413 100644
--- a/templates/xbps-base-chroot/template
+++ b/templates/xbps-base-chroot/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-chroot
-version=0.6
+version=0.7
 build_style=meta-template
 short_desc="xbps base packages for the chroot target"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,8 +10,30 @@ long_desc="
 
 noarch=yes
 base_chroot=yes
-build_depends="xbps-base-dirs-0.1 glibc-2.8 kernel-libc-headers-2.6.27.3
- gawk-3.1.6 bash-3.2 coreutils-6.12 texinfo-4.13 libarchive-2.5.5 tar-1.20
- grep-2.5.3 findutils-4.4.0 sed-4.1.5 make-3.81 diffutils-2.8.1 gcc-4.3.2
- file-4.26 proplib-0.1 patch-2.5.4 wget-1.11.4 dash-0.5.4"
-run_depends="$build_depends"
+
+Add_dependency full xbps-base-dirs
+Add_dependency full gcc
+Add_dependency full glibc
+Add_dependency full kernel-libc-headers
+Add_dependency full dash
+Add_dependency full patch
+Add_dependency full gawk
+Add_dependency full ncurses
+Add_dependency full bash
+Add_dependency full coreutils
+Add_dependency full texinfo
+Add_dependency full libarchive
+Add_dependency full tar
+Add_dependency full grep
+Add_dependency full findutils
+Add_dependency full sed
+Add_dependency full make
+Add_dependency full diffutils
+Add_dependency full file
+Add_dependency full proplib
+Add_dependency run zlib-devel
+Add_dependency run bzip2-devel
+Add_dependency run lzma-utils-devel
+Add_dependency run proplib-devel
+Add_dependency run libarchive-devel
+Add_dependency run ncurses-devel
diff --git a/templates/zlib-devel b/templates/zlib-devel
new file mode 120000
index 00000000000..8ccba3a29b1
--- /dev/null
+++ b/templates/zlib-devel
@@ -0,0 +1 @@
+zlib
\ No newline at end of file
diff --git a/templates/zlib/depends b/templates/zlib/depends
new file mode 100644
index 00000000000..eef117f0547
--- /dev/null
+++ b/templates/zlib/depends
@@ -0,0 +1,2 @@
+abi_depends=1.2.3
+api_depends=${abi_depends}
diff --git a/templates/zlib/devel.template b/templates/zlib/devel.template
new file mode 100644
index 00000000000..6fe55a56197
--- /dev/null
+++ b/templates/zlib/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'zlib-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run zlib
+
+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/libz.*a ${destdir}/usr/lib
+}
diff --git a/templates/zlib/template b/templates/zlib/template
index 1a544565551..7984d2af2c7 100644
--- a/templates/zlib/template
+++ b/templates/zlib/template
@@ -1,5 +1,6 @@
 # Template build file for 'zlib'
 pkgname=zlib
+sourcepkg=zlib
 version=1.2.3
 distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
 build_style=configure
@@ -14,4 +15,6 @@ long_desc="
  by RFCs (Request for Comments) 1950 to 1952."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="devel"
+
+Add_dependency run glibc