diff --git a/templates/binutils-base b/templates/binutils-base
new file mode 120000
index 00000000000..695eb82eae6
--- /dev/null
+++ b/templates/binutils-base
@@ -0,0 +1 @@
+binutils
\ No newline at end of file
diff --git a/templates/binutils/base.template b/templates/binutils/base.template
new file mode 100644
index 00000000000..9f94796bed1
--- /dev/null
+++ b/templates/binutils/base.template
@@ -0,0 +1,19 @@
+# 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-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/template b/templates/binutils/template
index c56c5b0903f..ad5e19e5376 100644
--- a/templates/binutils/template
+++ b/templates/binutils/template
@@ -25,5 +25,4 @@ long_desc="
  and other tools."
 
 base_chroot=yes
-run_depends="glibc-2.8"
-subpackages="dev docs locale"
+subpackages="base dev docs locale"
diff --git a/templates/gawk-base b/templates/gawk-base
new file mode 120000
index 00000000000..7ef87eea4dd
--- /dev/null
+++ b/templates/gawk-base
@@ -0,0 +1 @@
+gawk
\ No newline at end of file
diff --git a/templates/gawk/base.template b/templates/gawk/base.template
new file mode 100644
index 00000000000..ffc4b7e7d37
--- /dev/null
+++ b/templates/gawk/base.template
@@ -0,0 +1,21 @@
+# 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-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/template b/templates/gawk/template
index 31d802104c2..2640735b893 100644
--- a/templates/gawk/template
+++ b/templates/gawk/template
@@ -12,5 +12,4 @@ long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
 base_chroot=yes 
-run_depends="glibc-2.8"
-subpackages="locale"
+subpackages="base locale"
diff --git a/templates/gcc-base b/templates/gcc-base
new file mode 120000
index 00000000000..b08d5af5795
--- /dev/null
+++ b/templates/gcc-base
@@ -0,0 +1 @@
+gcc
\ No newline at end of file
diff --git a/templates/gcc/base.template b/templates/gcc/base.template
new file mode 100644
index 00000000000..3908f0eca20
--- /dev/null
+++ b/templates/gcc/base.template
@@ -0,0 +1,21 @@
+# 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-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/dev.template b/templates/gcc/dev.template
index bda507de7a2..a5729bd23cd 100644
--- a/templates/gcc/dev.template
+++ b/templates/gcc/dev.template
@@ -4,18 +4,16 @@ short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
-run_depends="gcc-libs-${version}"
+run_depends="gcc-base-${version}"
 
 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/${version}
+	mkdir -p ${destdir}/usr/lib
 
 	mv ${origdir}/usr/include ${destdir}/usr
-	mv ${origdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu/${version}/include \
-		${destdir}/usr/lib/gcc/${xbps_machine}-pc-linux-gnu/${version}
 
 	for f in mudflap mudflapth ssp_nonshared supc++ ssp stdc++ \
 		 objc gomp gcc_s; do
diff --git a/templates/gcc/template b/templates/gcc/template
index 8212d64c457..ef28e2ea3cd 100644
--- a/templates/gcc/template
+++ b/templates/gcc/template
@@ -20,8 +20,7 @@ long_desc="
 
 base_chroot=yes
 build_depends="gmp-4.2.4 mpfr-2.3.2 binutils-2.18"
-run_depends="glibc-2.8 gmp-libs-4.2.4 mpfr-libs-2.3.2 binutils-2.18"
-subpackages="dev docs locale"
+subpackages="base dev docs locale"
 
 # As specified in the LFS book, disable installing libiberty.
 pre_configure()