diff --git a/templates/bash-base b/templates/bash-base
new file mode 120000
index 0000000000..f4d7fa5708
--- /dev/null
+++ b/templates/bash-base
@@ -0,0 +1 @@
+bash
\ No newline at end of file
diff --git a/templates/bash-locale b/templates/bash-locale
new file mode 120000
index 0000000000..f4d7fa5708
--- /dev/null
+++ b/templates/bash-locale
@@ -0,0 +1 @@
+bash
\ No newline at end of file
diff --git a/templates/bash/base.template b/templates/bash/base.template
new file mode 100644
index 0000000000..7f70fc1a6d
--- /dev/null
+++ b/templates/bash/base.template
@@ -0,0 +1,21 @@
+# Template file for 'bash-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+# Run dependencies.
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/bin ${destdir}
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/bash/locale.template b/templates/bash/locale.template
new file mode 100644
index 0000000000..1b9eff5ec2
--- /dev/null
+++ b/templates/bash/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'bash-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/bash/template b/templates/bash/template
index c8c101f6ae..9f2562f135 100644
--- a/templates/bash/template
+++ b/templates/bash/template
@@ -1,5 +1,6 @@
 # Template build file for 'bash'.
 pkgname=bash
+sourcepkg=bash
 version=3.2.48
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
@@ -22,4 +23,5 @@ long_desc="
  modification."
 
 base_chroot=yes
-run_depends="glibc-2.8 ncurses-5.6"
+build_depends="ncurses-5.6"
+subpackages="base locale"
diff --git a/templates/binutils/base.template b/templates/binutils/base.template
index 8145d9bcf2..8f54f43406 100644
--- a/templates/binutils/base.template
+++ b/templates/binutils/base.template
@@ -4,7 +4,8 @@ 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"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/binutils/dev.template b/templates/binutils/dev.template
index d21319a26b..dfa67465ab 100644
--- a/templates/binutils/dev.template
+++ b/templates/binutils/dev.template
@@ -4,7 +4,7 @@ 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"
+run_depends="binutils-base-2.19"
 
 do_install()
 {
diff --git a/templates/binutils/libs.depends b/templates/binutils/libs.depends
new file mode 100644
index 0000000000..218cc35f3f
--- /dev/null
+++ b/templates/binutils/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} binutils-base-2.8"
diff --git a/templates/bzip2-base b/templates/bzip2-base
new file mode 120000
index 0000000000..a989e1da11
--- /dev/null
+++ b/templates/bzip2-base
@@ -0,0 +1 @@
+bzip2
\ No newline at end of file
diff --git a/templates/bzip2-dev b/templates/bzip2-dev
new file mode 120000
index 0000000000..a989e1da11
--- /dev/null
+++ b/templates/bzip2-dev
@@ -0,0 +1 @@
+bzip2
\ No newline at end of file
diff --git a/templates/bzip2-docs b/templates/bzip2-docs
new file mode 120000
index 0000000000..a989e1da11
--- /dev/null
+++ b/templates/bzip2-docs
@@ -0,0 +1 @@
+bzip2
\ No newline at end of file
diff --git a/templates/bzip2-libs b/templates/bzip2-libs
new file mode 120000
index 0000000000..a989e1da11
--- /dev/null
+++ b/templates/bzip2-libs
@@ -0,0 +1 @@
+bzip2
\ No newline at end of file
diff --git a/templates/bzip2/base.template b/templates/bzip2/base.template
new file mode 100644
index 0000000000..a53022f3d5
--- /dev/null
+++ b/templates/bzip2/base.template
@@ -0,0 +1,17 @@
+# Template file for 'bzip2-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/bzip2/dev.template b/templates/bzip2/dev.template
new file mode 100644
index 0000000000..ff612cadd7
--- /dev/null
+++ b/templates/bzip2/dev.template
@@ -0,0 +1,17 @@
+# Template file for 'bzip2-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="bzip2-libs-${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
+	mv ${origdir}/usr/lib/libbz2.*a ${destdir}/usr/lib
+}
diff --git a/templates/bzip2/docs.template b/templates/bzip2/docs.template
new file mode 100644
index 0000000000..82323bae57
--- /dev/null
+++ b/templates/bzip2/docs.template
@@ -0,0 +1,18 @@
+# Template file for 'bzip2-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/bzip2/libs.depends b/templates/bzip2/libs.depends
new file mode 100644
index 0000000000..a54121a6c2
--- /dev/null
+++ b/templates/bzip2/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} bzip2-libs-1.0.5"
diff --git a/templates/bzip2/libs.template b/templates/bzip2/libs.template
new file mode 100644
index 0000000000..7b723bf78f
--- /dev/null
+++ b/templates/bzip2/libs.template
@@ -0,0 +1,17 @@
+# Template file for 'bzip2-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libbz2.so* ${destdir}/usr/lib
+}
diff --git a/templates/bzip2/template b/templates/bzip2/template
index 7b2b63e4e8..870bc3f0b4 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,4 @@ long_desc="
  predecessor, bzip (.bz)."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base dev docs libs"
diff --git a/templates/coreutils-base b/templates/coreutils-base
new file mode 120000
index 0000000000..a4b710b178
--- /dev/null
+++ b/templates/coreutils-base
@@ -0,0 +1 @@
+coreutils
\ No newline at end of file
diff --git a/templates/coreutils-docs b/templates/coreutils-docs
new file mode 120000
index 0000000000..a4b710b178
--- /dev/null
+++ b/templates/coreutils-docs
@@ -0,0 +1 @@
+coreutils
\ No newline at end of file
diff --git a/templates/coreutils-locale b/templates/coreutils-locale
new file mode 120000
index 0000000000..a4b710b178
--- /dev/null
+++ b/templates/coreutils-locale
@@ -0,0 +1 @@
+coreutils
\ No newline at end of file
diff --git a/templates/coreutils/base.template b/templates/coreutils/base.template
new file mode 100644
index 0000000000..7202a9c9fd
--- /dev/null
+++ b/templates/coreutils/base.template
@@ -0,0 +1,17 @@
+# Template file for 'coreutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}
+	mv ${origdir}/bin ${destdir}
+}
diff --git a/templates/coreutils/docs.template b/templates/coreutils/docs.template
new file mode 100644
index 0000000000..da2b8dcb1b
--- /dev/null
+++ b/templates/coreutils/docs.template
@@ -0,0 +1,20 @@
+# Template file for 'coreutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	# Move manpages and info files.
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}
diff --git a/templates/coreutils/locale.template b/templates/coreutils/locale.template
new file mode 100644
index 0000000000..f345cf2fe9
--- /dev/null
+++ b/templates/coreutils/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'coreutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/coreutils/template b/templates/coreutils/template
index 042ed8aa20..f30323ec0f 100644
--- a/templates/coreutils/template
+++ b/templates/coreutils/template
@@ -1,5 +1,6 @@
 # Template file for 'coreutils'
 pkgname=coreutils
+sourcepkg=coreutils
 version=6.12
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -15,4 +16,4 @@ long_desc="
  which are expected to exist on every operating system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"
diff --git a/templates/dash/template b/templates/dash/template
index 64e9d9af6d..e7e462ce2f 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"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 post_install()
 {
diff --git a/templates/diffutils-base b/templates/diffutils-base
new file mode 120000
index 0000000000..815745d465
--- /dev/null
+++ b/templates/diffutils-base
@@ -0,0 +1 @@
+diffutils
\ No newline at end of file
diff --git a/templates/diffutils-docs b/templates/diffutils-docs
new file mode 120000
index 0000000000..815745d465
--- /dev/null
+++ b/templates/diffutils-docs
@@ -0,0 +1 @@
+diffutils
\ No newline at end of file
diff --git a/templates/diffutils-locale b/templates/diffutils-locale
new file mode 120000
index 0000000000..815745d465
--- /dev/null
+++ b/templates/diffutils-locale
@@ -0,0 +1 @@
+diffutils
\ No newline at end of file
diff --git a/templates/diffutils/base.template b/templates/diffutils/base.template
new file mode 100644
index 0000000000..2b1a6edae4
--- /dev/null
+++ b/templates/diffutils/base.template
@@ -0,0 +1,17 @@
+# Template file for 'diffutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/diffutils/docs.template b/templates/diffutils/docs.template
new file mode 100644
index 0000000000..7187bb688d
--- /dev/null
+++ b/templates/diffutils/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'diffutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/diffutils/locale.template b/templates/diffutils/locale.template
new file mode 100644
index 0000000000..7091c8ddc9
--- /dev/null
+++ b/templates/diffutils/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'diffutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/diffutils/template b/templates/diffutils/template
index 131d61d2be..47f65a42f4 100644
--- a/templates/diffutils/template
+++ b/templates/diffutils/template
@@ -1,5 +1,6 @@
 # Template file for 'diffutils'
 pkgname=diffutils
+sourcepkg=diffutils
 version=2.8.1
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -12,5 +13,5 @@ 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
+subpackages="base docs locale"
diff --git a/templates/file-base b/templates/file-base
new file mode 120000
index 0000000000..1a010b1c0f
--- /dev/null
+++ b/templates/file-base
@@ -0,0 +1 @@
+file
\ No newline at end of file
diff --git a/templates/file-dev b/templates/file-dev
new file mode 120000
index 0000000000..1a010b1c0f
--- /dev/null
+++ b/templates/file-dev
@@ -0,0 +1 @@
+file
\ No newline at end of file
diff --git a/templates/file-libs b/templates/file-libs
new file mode 120000
index 0000000000..1a010b1c0f
--- /dev/null
+++ b/templates/file-libs
@@ -0,0 +1 @@
+file
\ No newline at end of file
diff --git a/templates/file/base.template b/templates/file/base.template
new file mode 100644
index 0000000000..3e7fa64df3
--- /dev/null
+++ b/templates/file/base.template
@@ -0,0 +1,18 @@
+# Template file for 'file-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+run_depends="file-libs-${version}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share/man/man1
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/share/file ${destdir}/usr/share
+	mv ${origdir}/usr/share/man/man1 ${destdir}/usr/share/man
+}
diff --git a/templates/file/dev.template b/templates/file/dev.template
new file mode 100644
index 0000000000..e19380a73f
--- /dev/null
+++ b/templates/file/dev.template
@@ -0,0 +1,17 @@
+# Template file for 'file-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="file-libs-${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
+	mv ${origdir}/usr/lib/libmagic.*a ${destdir}/usr/lib
+}
diff --git a/templates/file/libs.depends b/templates/file/libs.depends
new file mode 100644
index 0000000000..4b1e4f725f
--- /dev/null
+++ b/templates/file/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} file-libs-5.00"
diff --git a/templates/file/libs.template b/templates/file/libs.template
new file mode 100644
index 0000000000..48d356c307
--- /dev/null
+++ b/templates/file/libs.template
@@ -0,0 +1,21 @@
+# Template file for 'file-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/zlib/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mkdir -p ${destdir}/usr/share/man
+	mv ${origdir}/usr/lib/libmagic.so* ${destdir}/usr/lib
+	mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man
+	mv ${origdir}/usr/share/man/man4 ${destdir}/usr/share/man
+}
diff --git a/templates/file/template b/templates/file/template
index 1618471a29..f398275f29 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
@@ -13,4 +14,4 @@ long_desc="
 
 base_chroot=yes
 build_depends="zlib-1.2.3"
-run_depends="glibc-2.8 zlib-1.2.3"
+subpackages="base dev libs"
diff --git a/templates/findutils-base b/templates/findutils-base
new file mode 120000
index 0000000000..44e468bf63
--- /dev/null
+++ b/templates/findutils-base
@@ -0,0 +1 @@
+findutils
\ No newline at end of file
diff --git a/templates/findutils-docs b/templates/findutils-docs
new file mode 120000
index 0000000000..44e468bf63
--- /dev/null
+++ b/templates/findutils-docs
@@ -0,0 +1 @@
+findutils
\ No newline at end of file
diff --git a/templates/findutils-locale b/templates/findutils-locale
new file mode 120000
index 0000000000..44e468bf63
--- /dev/null
+++ b/templates/findutils-locale
@@ -0,0 +1 @@
+findutils
\ No newline at end of file
diff --git a/templates/findutils/base.template b/templates/findutils/base.template
new file mode 100644
index 0000000000..59ab7b3546
--- /dev/null
+++ b/templates/findutils/base.template
@@ -0,0 +1,19 @@
+# Template file for 'findutils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/libexec ${destdir}/usr
+	mv ${origdir}/var ${destdir}
+}
diff --git a/templates/findutils/docs.template b/templates/findutils/docs.template
new file mode 100644
index 0000000000..2c31b77247
--- /dev/null
+++ b/templates/findutils/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'findutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/findutils/locale.template b/templates/findutils/locale.template
new file mode 100644
index 0000000000..53fba5c13e
--- /dev/null
+++ b/templates/findutils/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'findutils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/findutils/template b/templates/findutils/template
index cb8d84216f..a905af4ed2 100644
--- a/templates/findutils/template
+++ b/templates/findutils/template
@@ -1,5 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
+sourcepkg=findutils
 version=4.4.0
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -16,4 +17,4 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"
diff --git a/templates/gawk/base.template b/templates/gawk/base.template
index 038fbd4fdd..e41dac31db 100644
--- a/templates/gawk/base.template
+++ b/templates/gawk/base.template
@@ -4,7 +4,8 @@ short_desc="${short_desc} (base files)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} base files."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/gcc/base.template b/templates/gcc/base.template
index 7576be11fb..630b4693f1 100644
--- a/templates/gcc/base.template
+++ b/templates/gcc/base.template
@@ -4,7 +4,11 @@ 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"
+
+run_depends="binutils-base-2.18"
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/gmp/libs.depends
+. ${XBPS_TEMPLATESDIR}/mpfr/libs.depends
 
 do_install()
 {
@@ -18,4 +22,5 @@ do_install()
 	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
+	cd ${destdir}/usr/lib && ln -s libgcc_s.so.1 libgcc_s.so
 }
diff --git a/templates/gcc/libs.depends b/templates/gcc/libs.depends
new file mode 100644
index 0000000000..8f906d3670
--- /dev/null
+++ b/templates/gcc/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} gcc-base-4.3.2"
diff --git a/templates/glibc/base.template b/templates/glibc/base.template
index 747c690fb5..29a5ad1e36 100644
--- a/templates/glibc/base.template
+++ b/templates/glibc/base.template
@@ -7,7 +7,8 @@ long_desc="${long_desc}
 
 conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
  /etc/nsswitch.conf"
-run_depends="glibc-libs-${version}"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/glibc/dev.template b/templates/glibc/dev.template
index 208b19aaf8..c75aa15c41 100644
--- a/templates/glibc/dev.template
+++ b/templates/glibc/dev.template
@@ -4,7 +4,8 @@ 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}"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/glibc/libs.depends b/templates/glibc/libs.depends
new file mode 100644
index 0000000000..8f9dcf79ec
--- /dev/null
+++ b/templates/glibc/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} glibc-libs-2.8"
diff --git a/templates/gmp/libs.depends b/templates/gmp/libs.depends
new file mode 100644
index 0000000000..07210b6823
--- /dev/null
+++ b/templates/gmp/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} gmp-libs-4.2.4"
diff --git a/templates/gmp/libs.template b/templates/gmp/libs.template
index ea37934cac..7a2207e033 100644
--- a/templates/gmp/libs.template
+++ b/templates/gmp/libs.template
@@ -4,7 +4,8 @@ short_desc="${short_desc} (libraries)"
 long_desc="${long_desc}
 
  This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/grep-base b/templates/grep-base
new file mode 120000
index 0000000000..9b059dc5d8
--- /dev/null
+++ b/templates/grep-base
@@ -0,0 +1 @@
+grep
\ No newline at end of file
diff --git a/templates/grep-docs b/templates/grep-docs
new file mode 120000
index 0000000000..9b059dc5d8
--- /dev/null
+++ b/templates/grep-docs
@@ -0,0 +1 @@
+grep
\ No newline at end of file
diff --git a/templates/grep-locale b/templates/grep-locale
new file mode 120000
index 0000000000..9b059dc5d8
--- /dev/null
+++ b/templates/grep-locale
@@ -0,0 +1 @@
+grep
\ No newline at end of file
diff --git a/templates/grep/base.template b/templates/grep/base.template
new file mode 100644
index 0000000000..e8e503d38f
--- /dev/null
+++ b/templates/grep/base.template
@@ -0,0 +1,17 @@
+# Template file for 'grep-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}
+	mv ${origdir}/bin ${destdir}
+}
diff --git a/templates/grep/docs.template b/templates/grep/docs.template
new file mode 100644
index 0000000000..201c2341c2
--- /dev/null
+++ b/templates/grep/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'grep-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/grep/locale.template b/templates/grep/locale.template
new file mode 100644
index 0000000000..944070ef9d
--- /dev/null
+++ b/templates/grep/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'grep-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/grep/template b/templates/grep/template
index 3496fe3837..d314af298d 100644
--- a/templates/grep/template
+++ b/templates/grep/template
@@ -1,5 +1,6 @@
 # Template build file for 'grep'.
 pkgname=grep
+sourcepkg=grep
 version=2.5.4
 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -17,4 +18,4 @@ long_desc="
 
 base_chroot=yes
 build_depends="texinfo-4.13a"
-run_depends="glibc-2.8"
+subpackages="base docs locale"
diff --git a/templates/gzip-base b/templates/gzip-base
new file mode 120000
index 0000000000..e7aec8eaef
--- /dev/null
+++ b/templates/gzip-base
@@ -0,0 +1 @@
+gzip
\ No newline at end of file
diff --git a/templates/gzip-docs b/templates/gzip-docs
new file mode 120000
index 0000000000..e7aec8eaef
--- /dev/null
+++ b/templates/gzip-docs
@@ -0,0 +1 @@
+gzip
\ No newline at end of file
diff --git a/templates/gzip/base.template b/templates/gzip/base.template
new file mode 100644
index 0000000000..526641d2f2
--- /dev/null
+++ b/templates/gzip/base.template
@@ -0,0 +1,17 @@
+# Template file for 'gzip-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/gzip/docs.template b/templates/gzip/docs.template
new file mode 100644
index 0000000000..a0ce295560
--- /dev/null
+++ b/templates/gzip/docs.template
@@ -0,0 +1,20 @@
+# Template file for 'gzip-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	# Move manpages and info files.
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}
diff --git a/templates/gzip/template b/templates/gzip/template
index 0109161357..a4e5ad928a 100644
--- a/templates/gzip/template
+++ b/templates/gzip/template
@@ -1,5 +1,6 @@
 # Template file for 'gzip'
 pkgname=gzip
+sourcepkg=gzip
 version=1.3.12
 distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -13,4 +14,4 @@ long_desc="
  standard compression program for its system."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs"
diff --git a/templates/libarchive-base b/templates/libarchive-base
new file mode 120000
index 0000000000..6e93d9cc1c
--- /dev/null
+++ b/templates/libarchive-base
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/templates/libarchive-dev b/templates/libarchive-dev
new file mode 120000
index 0000000000..6e93d9cc1c
--- /dev/null
+++ b/templates/libarchive-dev
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/templates/libarchive-docs b/templates/libarchive-docs
new file mode 120000
index 0000000000..6e93d9cc1c
--- /dev/null
+++ b/templates/libarchive-docs
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/templates/libarchive-libs b/templates/libarchive-libs
new file mode 120000
index 0000000000..6e93d9cc1c
--- /dev/null
+++ b/templates/libarchive-libs
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/templates/libarchive/base.template b/templates/libarchive/base.template
new file mode 100644
index 0000000000..09adaf1ab7
--- /dev/null
+++ b/templates/libarchive/base.template
@@ -0,0 +1,17 @@
+# Template file for 'libarchive-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/libarchive/dev.template b/templates/libarchive/dev.template
new file mode 100644
index 0000000000..fc681b1575
--- /dev/null
+++ b/templates/libarchive/dev.template
@@ -0,0 +1,18 @@
+# Template file for 'libarchive-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+. ${XBPS_TEMPLATESDIR}/libarchive/libs.depends
+
+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/libarchive.*a ${destdir}/usr/lib
+}
diff --git a/templates/libarchive/docs.template b/templates/libarchive/docs.template
new file mode 100644
index 0000000000..e1f91574e3
--- /dev/null
+++ b/templates/libarchive/docs.template
@@ -0,0 +1,18 @@
+# Template file for 'libarchive-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/libarchive/libs.depends b/templates/libarchive/libs.depends
new file mode 100644
index 0000000000..63de5b2d89
--- /dev/null
+++ b/templates/libarchive/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} libarchive-libs-2.6.1"
diff --git a/templates/libarchive/libs.template b/templates/libarchive/libs.template
new file mode 100644
index 0000000000..bca19c3694
--- /dev/null
+++ b/templates/libarchive/libs.template
@@ -0,0 +1,20 @@
+# Template file for 'libarchive-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/zlib/libs.depends
+. ${XBPS_TEMPLATESDIR}/bzip2/libs.depends
+. ${XBPS_TEMPLATESDIR}/lzma-utils/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libarchive.so* ${destdir}/usr/lib
+}
diff --git a/templates/libarchive/template b/templates/libarchive/template
index 18308ce9d8..6d8b4d6970 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
@@ -16,4 +15,4 @@ long_desc="
 
 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="base dev docs libs"
diff --git a/templates/lzma-utils-base b/templates/lzma-utils-base
new file mode 120000
index 0000000000..2be97a1091
--- /dev/null
+++ b/templates/lzma-utils-base
@@ -0,0 +1 @@
+lzma-utils
\ No newline at end of file
diff --git a/templates/lzma-utils-dev b/templates/lzma-utils-dev
new file mode 120000
index 0000000000..2be97a1091
--- /dev/null
+++ b/templates/lzma-utils-dev
@@ -0,0 +1 @@
+lzma-utils
\ No newline at end of file
diff --git a/templates/lzma-utils-docs b/templates/lzma-utils-docs
new file mode 120000
index 0000000000..2be97a1091
--- /dev/null
+++ b/templates/lzma-utils-docs
@@ -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 0000000000..2be97a1091
--- /dev/null
+++ b/templates/lzma-utils-libs
@@ -0,0 +1 @@
+lzma-utils
\ No newline at end of file
diff --git a/templates/lzma-utils/base.template b/templates/lzma-utils/base.template
new file mode 100644
index 0000000000..81fbd2676c
--- /dev/null
+++ b/templates/lzma-utils/base.template
@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/lzma-utils/dev.template b/templates/lzma-utils/dev.template
new file mode 100644
index 0000000000..824c45c61d
--- /dev/null
+++ b/templates/lzma-utils/dev.template
@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="lzma-utils-libs-${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
+	mv ${origdir}/usr/lib/liblzmadec.*a ${destdir}/usr/lib
+}
diff --git a/templates/lzma-utils/docs.template b/templates/lzma-utils/docs.template
new file mode 100644
index 0000000000..c2e41b6db2
--- /dev/null
+++ b/templates/lzma-utils/docs.template
@@ -0,0 +1,18 @@
+# Template file for 'lzma-utils-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/lzma-utils/libs.depends b/templates/lzma-utils/libs.depends
new file mode 100644
index 0000000000..ec8e3475c6
--- /dev/null
+++ b/templates/lzma-utils/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} lzma-utils-libs-4.32.7"
diff --git a/templates/lzma-utils/libs.template b/templates/lzma-utils/libs.template
new file mode 100644
index 0000000000..17a7870e8d
--- /dev/null
+++ b/templates/lzma-utils/libs.template
@@ -0,0 +1,17 @@
+# Template file for 'lzma-utils-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+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 2d26779fb3..30979e9ad4 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,4 @@ long_desc="
  bzip2 utilities."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base dev docs libs"
diff --git a/templates/make-base b/templates/make-base
new file mode 120000
index 0000000000..ac08cdcf95
--- /dev/null
+++ b/templates/make-base
@@ -0,0 +1 @@
+make
\ No newline at end of file
diff --git a/templates/make-docs b/templates/make-docs
new file mode 120000
index 0000000000..ac08cdcf95
--- /dev/null
+++ b/templates/make-docs
@@ -0,0 +1 @@
+make
\ No newline at end of file
diff --git a/templates/make-locale b/templates/make-locale
new file mode 120000
index 0000000000..ac08cdcf95
--- /dev/null
+++ b/templates/make-locale
@@ -0,0 +1 @@
+make
\ No newline at end of file
diff --git a/templates/make/base.template b/templates/make/base.template
new file mode 100644
index 0000000000..4400d920d4
--- /dev/null
+++ b/templates/make/base.template
@@ -0,0 +1,17 @@
+# Template file for 'make-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+}
diff --git a/templates/make/docs.template b/templates/make/docs.template
new file mode 100644
index 0000000000..4339733d70
--- /dev/null
+++ b/templates/make/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'make-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/make/locale.template b/templates/make/locale.template
new file mode 100644
index 0000000000..92bb3416f7
--- /dev/null
+++ b/templates/make/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'make-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/make/template b/templates/make/template
index 5ed5fa1a5b..262fc456e2 100644
--- a/templates/make/template
+++ b/templates/make/template
@@ -1,5 +1,6 @@
 # Template build file for 'make'
 pkgname=make
+sourcepkg=make
 version=3.81
 distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -12,4 +13,4 @@ long_desc="
  recompile them, when necessary."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="base docs locale"
diff --git a/templates/mpfr/libs.depends b/templates/mpfr/libs.depends
new file mode 100644
index 0000000000..0730ae279b
--- /dev/null
+++ b/templates/mpfr/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} mpfr-libs-4.2.4"
diff --git a/templates/mpfr/libs.template b/templates/mpfr/libs.template
index 2e1105bd82..acf5610f7b 100644
--- a/templates/mpfr/libs.template
+++ b/templates/mpfr/libs.template
@@ -4,7 +4,9 @@ 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"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+. ${XBPS_TEMPLATESDIR}/gmp/libs.depends
 
 do_install()
 {
diff --git a/templates/ncurses-base b/templates/ncurses-base
new file mode 120000
index 0000000000..ebb49ce34f
--- /dev/null
+++ b/templates/ncurses-base
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses-dev b/templates/ncurses-dev
new file mode 120000
index 0000000000..ebb49ce34f
--- /dev/null
+++ b/templates/ncurses-dev
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses-docs b/templates/ncurses-docs
new file mode 120000
index 0000000000..ebb49ce34f
--- /dev/null
+++ b/templates/ncurses-docs
@@ -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 0000000000..ebb49ce34f
--- /dev/null
+++ b/templates/ncurses-libs
@@ -0,0 +1 @@
+ncurses
\ No newline at end of file
diff --git a/templates/ncurses/base.template b/templates/ncurses/base.template
new file mode 100644
index 0000000000..c8d0114be6
--- /dev/null
+++ b/templates/ncurses/base.template
@@ -0,0 +1,19 @@
+# Template file for 'ncurses-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/share/terminfo ${destdir}/usr/share
+	mv ${origdir}/usr/share/tabset ${destdir}/usr/share
+}
diff --git a/templates/ncurses/dev.template b/templates/ncurses/dev.template
new file mode 100644
index 0000000000..01529ed0f2
--- /dev/null
+++ b/templates/ncurses/dev.template
@@ -0,0 +1,18 @@
+# Template file for 'ncurses-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+. ${XBPS_TEMPLATESDIR}/ncurses/libs.depends
+
+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/lib*.*a ${destdir}/usr/lib
+}
diff --git a/templates/ncurses/docs.template b/templates/ncurses/docs.template
new file mode 100644
index 0000000000..6e87a5123d
--- /dev/null
+++ b/templates/ncurses/docs.template
@@ -0,0 +1,18 @@
+# Template file for 'ncurses-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/ncurses/libs.depends b/templates/ncurses/libs.depends
new file mode 100644
index 0000000000..e12449ef6e
--- /dev/null
+++ b/templates/ncurses/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} ncurses-libs-5.6"
diff --git a/templates/ncurses/libs.template b/templates/ncurses/libs.template
new file mode 100644
index 0000000000..1232f156bf
--- /dev/null
+++ b/templates/ncurses/libs.template
@@ -0,0 +1,22 @@
+# Template file for 'ncurses-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+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/libncurses*.so* ${destdir}/lib
+	cd ${destdir}/lib && \
+		ln -s libncurses.so.${version} libtinfo.so.${version}
+	mv ${origdir}/usr/lib/lib*.so* ${destdir}/usr/lib
+
+}
diff --git a/templates/ncurses/template b/templates/ncurses/template
index 096ae1893d..131e7caa67 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,5 @@ 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 dev docs libs"
diff --git a/templates/patch/template b/templates/patch/template
index 90564352c1..6fcf7cf2d6 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
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
diff --git a/templates/proplib/libs.depends b/templates/proplib/libs.depends
new file mode 100644
index 0000000000..89417a919a
--- /dev/null
+++ b/templates/proplib/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} proplib-libs-0.1"
diff --git a/templates/proplib/libs.template b/templates/proplib/libs.template
index d7a31fd64b..5a2bc11504 100644
--- a/templates/proplib/libs.template
+++ b/templates/proplib/libs.template
@@ -4,7 +4,8 @@ short_desc="${short_desc} (libraries)"
 long_desc="${long_desc}
 
  This package contains only the ${sourcepkg} shared libraries."
-run_depends="glibc-libs-2.8"
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
 
 do_install()
 {
diff --git a/templates/sed-base b/templates/sed-base
new file mode 120000
index 0000000000..fb996d6d59
--- /dev/null
+++ b/templates/sed-base
@@ -0,0 +1 @@
+sed
\ No newline at end of file
diff --git a/templates/sed-docs b/templates/sed-docs
new file mode 120000
index 0000000000..fb996d6d59
--- /dev/null
+++ b/templates/sed-docs
@@ -0,0 +1 @@
+sed
\ No newline at end of file
diff --git a/templates/sed-locale b/templates/sed-locale
new file mode 120000
index 0000000000..fb996d6d59
--- /dev/null
+++ b/templates/sed-locale
@@ -0,0 +1 @@
+sed
\ No newline at end of file
diff --git a/templates/sed/base.template b/templates/sed/base.template
new file mode 100644
index 0000000000..b48109da69
--- /dev/null
+++ b/templates/sed/base.template
@@ -0,0 +1,17 @@
+# Template file for 'sed-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}
+	mv ${origdir}/bin ${destdir}
+}
diff --git a/templates/sed/docs.template b/templates/sed/docs.template
new file mode 100644
index 0000000000..deb89c7493
--- /dev/null
+++ b/templates/sed/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'sed-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/sed/locale.template b/templates/sed/locale.template
new file mode 100644
index 0000000000..22a72d514c
--- /dev/null
+++ b/templates/sed/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'sed-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/sed/template b/templates/sed/template
index ed5ca4349c..c42b9083c4 100644
--- a/templates/sed/template
+++ b/templates/sed/template
@@ -1,5 +1,6 @@
 # Template file for 'sed'
 pkgname=sed
+sourcepkg=sed
 version=4.1.5
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -11,5 +12,5 @@ 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
+subpackages="base docs locale"
diff --git a/templates/tar-base b/templates/tar-base
new file mode 120000
index 0000000000..e1d18b02ad
--- /dev/null
+++ b/templates/tar-base
@@ -0,0 +1 @@
+tar
\ No newline at end of file
diff --git a/templates/tar-docs b/templates/tar-docs
new file mode 120000
index 0000000000..e1d18b02ad
--- /dev/null
+++ b/templates/tar-docs
@@ -0,0 +1 @@
+tar
\ No newline at end of file
diff --git a/templates/tar-locale b/templates/tar-locale
new file mode 120000
index 0000000000..e1d18b02ad
--- /dev/null
+++ b/templates/tar-locale
@@ -0,0 +1 @@
+tar
\ No newline at end of file
diff --git a/templates/tar/base.template b/templates/tar/base.template
new file mode 100644
index 0000000000..7891fe1a61
--- /dev/null
+++ b/templates/tar/base.template
@@ -0,0 +1,18 @@
+# Template file for 'tar-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/libexec ${destdir}/usr
+}
diff --git a/templates/tar/docs.template b/templates/tar/docs.template
new file mode 100644
index 0000000000..93c4aea987
--- /dev/null
+++ b/templates/tar/docs.template
@@ -0,0 +1,18 @@
+# Template file for 'tar-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}
diff --git a/templates/tar/locale.template b/templates/tar/locale.template
new file mode 100644
index 0000000000..cc2f811087
--- /dev/null
+++ b/templates/tar/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'tar-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/tar/template b/templates/tar/template
index d85184073e..7626b8cbc5 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
+subpackages="base docs locale"
diff --git a/templates/texinfo-base b/templates/texinfo-base
new file mode 120000
index 0000000000..f00c57ddbf
--- /dev/null
+++ b/templates/texinfo-base
@@ -0,0 +1 @@
+texinfo
\ No newline at end of file
diff --git a/templates/texinfo-docs b/templates/texinfo-docs
new file mode 120000
index 0000000000..f00c57ddbf
--- /dev/null
+++ b/templates/texinfo-docs
@@ -0,0 +1 @@
+texinfo
\ No newline at end of file
diff --git a/templates/texinfo-locale b/templates/texinfo-locale
new file mode 120000
index 0000000000..f00c57ddbf
--- /dev/null
+++ b/templates/texinfo-locale
@@ -0,0 +1 @@
+texinfo
\ No newline at end of file
diff --git a/templates/texinfo/base.template b/templates/texinfo/base.template
new file mode 100644
index 0000000000..9b630c8cac
--- /dev/null
+++ b/templates/texinfo/base.template
@@ -0,0 +1,18 @@
+# Template file for 'texinfo-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/usr/share/texinfo ${destdir}/usr/share
+}
diff --git a/templates/texinfo/docs.template b/templates/texinfo/docs.template
new file mode 100644
index 0000000000..54a923480c
--- /dev/null
+++ b/templates/texinfo/docs.template
@@ -0,0 +1,20 @@
+# Template file for 'texinfo-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	# Move manpages and info files.
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+}
diff --git a/templates/texinfo/locale.template b/templates/texinfo/locale.template
new file mode 100644
index 0000000000..84a7de596e
--- /dev/null
+++ b/templates/texinfo/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'texinfo-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/texinfo/template b/templates/texinfo/template
index cbef12c124..1d7cbc0d86 100644
--- a/templates/texinfo/template
+++ b/templates/texinfo/template
@@ -1,5 +1,6 @@
 # Template file for 'texinfo'
 pkgname=texinfo
+sourcepkg=texinfo
 version=4.13a
 wrksrc="$pkgname-4.13"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
@@ -13,5 +14,5 @@ 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
+subpackages="base docs locale"
diff --git a/templates/wget-base b/templates/wget-base
new file mode 120000
index 0000000000..79949cdec4
--- /dev/null
+++ b/templates/wget-base
@@ -0,0 +1 @@
+wget
\ No newline at end of file
diff --git a/templates/wget-docs b/templates/wget-docs
new file mode 120000
index 0000000000..79949cdec4
--- /dev/null
+++ b/templates/wget-docs
@@ -0,0 +1 @@
+wget
\ No newline at end of file
diff --git a/templates/wget-locale b/templates/wget-locale
new file mode 120000
index 0000000000..79949cdec4
--- /dev/null
+++ b/templates/wget-locale
@@ -0,0 +1 @@
+wget
\ No newline at end of file
diff --git a/templates/wget/base.template b/templates/wget/base.template
new file mode 100644
index 0000000000..e0e2083197
--- /dev/null
+++ b/templates/wget/base.template
@@ -0,0 +1,20 @@
+# Template file for 'wget-base'.
+#
+short_desc="${short_desc} (base files)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} base files."
+
+conf_files="/etc/wgetrc"
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+# TODO: add openssl dependency
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr
+	mv ${origdir}/usr/bin ${destdir}/usr
+	mv ${origdir}/etc ${destdir}
+}
diff --git a/templates/wget/docs.template b/templates/wget/docs.template
new file mode 100644
index 0000000000..308fef7b85
--- /dev/null
+++ b/templates/wget/docs.template
@@ -0,0 +1,19 @@
+# Template file for 'wget-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/info ${destdir}/usr/share
+	mv ${origdir}/usr/share/man ${destdir}/usr/share
+}
diff --git a/templates/wget/locale.template b/templates/wget/locale.template
new file mode 100644
index 0000000000..7672c7799a
--- /dev/null
+++ b/templates/wget/locale.template
@@ -0,0 +1,17 @@
+# Template file for 'wget-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}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/wget/template b/templates/wget/template
index 4a971baf70..3ca971ec2a 100644
--- a/templates/wget/template
+++ b/templates/wget/template
@@ -1,5 +1,6 @@
 # Template file for 'wget'
 pkgname=wget
+sourcepkg=wget
 version=1.11.4
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -29,8 +30,5 @@ 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
+subpackages="base docs locale"
diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template
index a074a98476..7254cb2303 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,14 @@ 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"
+shared_deps="kernel-libc-headers-0 dash-0 patch-0"
+
+build_depends="xbps-base-dirs-0 glibc-0 gawk-0 bash-0 coreutils-0
+ texinfo-0 libarchive-0 tar-0 grep-0 findutils-0 sed-0 make-0
+ diffutils-0 gcc-0 file-0 wget-0 ncurses-0 proplib-0 ${shared_deps}"
+
+run_depends="glibc-base-0 glibc-dev-0 gcc-dev-0 ncurses-dev-0
+ proplib-dev-0 gawk-base-0 bash-base-0 wget-base-0 tar-base-0
+ coreutils-base-0 texinfo-base-0 libarchive-dev-0 grep-base-0
+ findutils-base-0 sed-base-0 make-base-0 diffutils-base-0
+ file-base-0 ${shared_deps}"
diff --git a/templates/zlib-dev b/templates/zlib-dev
new file mode 120000
index 0000000000..8ccba3a29b
--- /dev/null
+++ b/templates/zlib-dev
@@ -0,0 +1 @@
+zlib
\ No newline at end of file
diff --git a/templates/zlib-libs b/templates/zlib-libs
new file mode 120000
index 0000000000..8ccba3a29b
--- /dev/null
+++ b/templates/zlib-libs
@@ -0,0 +1 @@
+zlib
\ No newline at end of file
diff --git a/templates/zlib/dev.template b/templates/zlib/dev.template
new file mode 100644
index 0000000000..15da33aa95
--- /dev/null
+++ b/templates/zlib/dev.template
@@ -0,0 +1,18 @@
+# Template file for 'zlib-dev'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+run_depends="bzip2-libs-${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
+	mv ${origdir}/usr/lib/libz.*a ${destdir}/usr/lib
+	mv ${origdir}/usr/share ${destdir}/usr
+}
diff --git a/templates/zlib/libs.depends b/templates/zlib/libs.depends
new file mode 100644
index 0000000000..866da26faa
--- /dev/null
+++ b/templates/zlib/libs.depends
@@ -0,0 +1 @@
+run_depends="${run_depends} zlib-libs-1.2.3"
diff --git a/templates/zlib/libs.template b/templates/zlib/libs.template
new file mode 100644
index 0000000000..d193df263c
--- /dev/null
+++ b/templates/zlib/libs.template
@@ -0,0 +1,17 @@
+# Template file for 'zlib-libs'.
+#
+short_desc="${short_desc} (libraries)"
+long_desc="${long_desc}
+
+ This package contains only the ${sourcepkg} shared libraries."
+
+. ${XBPS_TEMPLATESDIR}/glibc/libs.depends
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/lib/libz.so* ${destdir}/usr/lib
+}
diff --git a/templates/zlib/template b/templates/zlib/template
index 1a54456555..7d7ad6d410 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,4 @@ long_desc="
  by RFCs (Request for Comments) 1950 to 1952."
 
 base_chroot=yes
-run_depends="glibc-2.8"
+subpackages="dev libs"