diff --git a/templates/glibc-base b/templates/glibc-base
new file mode 120000
index 0000000000..0c4c137d7c
--- /dev/null
+++ b/templates/glibc-base
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/templates/glibc-dev b/templates/glibc-dev
new file mode 120000
index 0000000000..0c4c137d7c
--- /dev/null
+++ b/templates/glibc-dev
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/templates/glibc-libs b/templates/glibc-libs
new file mode 120000
index 0000000000..0c4c137d7c
--- /dev/null
+++ b/templates/glibc-libs
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/templates/glibc-locale b/templates/glibc-locale
new file mode 120000
index 0000000000..0c4c137d7c
--- /dev/null
+++ b/templates/glibc-locale
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/templates/glibc/base.template b/templates/glibc/base.template
new file mode 100644
index 0000000000..747c690fb5
--- /dev/null
+++ b/templates/glibc/base.template
@@ -0,0 +1,24 @@
+# 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/dev.template b/templates/glibc/dev.template
new file mode 100644
index 0000000000..208b19aaf8
--- /dev/null
+++ b/templates/glibc/dev.template
@@ -0,0 +1,17 @@
+# Template file for 'glibc-dev'.
+#
+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}"
+
+do_install()
+{
+	local destdir=${XBPS_DESTDIR}/${pkgname}-${version}
+	local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version}
+
+	mkdir -p ${destdir}/usr/lib
+	mv ${origdir}/usr/include ${destdir}/usr
+	mv ${origdir}/usr/lib/*.a ${destdir}/usr/lib
+}
diff --git a/templates/glibc/libs.template b/templates/glibc/libs.template
new file mode 100644
index 0000000000..d4c0bd06f7
--- /dev/null
+++ b/templates/glibc/libs.template
@@ -0,0 +1,19 @@
+# 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/locale.template
new file mode 100644
index 0000000000..8ecc9d6bce
--- /dev/null
+++ b/templates/glibc/locale.template
@@ -0,0 +1,18 @@
+# Template file for 'glibc-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/i18n ${destdir}/usr/share
+	mv ${origdir}/usr/share/locale ${destdir}/usr/share
+}
diff --git a/templates/glibc/template b/templates/glibc/template
index b03c2c234d..0393d4cd91 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -1,5 +1,6 @@
 # Template file for 'glibc'
 pkgname=glibc
+sourcepkg=glibc
 version=2.9
 glibc_snapdate=20090209
 wrksrc="$pkgname-$version-$glibc_snapdate"
@@ -10,8 +11,7 @@ configure_args="--with-tls -disable-profile --with-__thread
  --enable-kernel=2.6.16 --enable-add-ons --without-gd --enable-bind-now
  --without-cvs --without-selinux --infodir=/usr/share/info
  --libdir=/usr/lib --libexecdir=/usr/lib"
-make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install
- localedata/install-locales"
+make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d5ae995e8a90ffa6ed05e213f3ce4c5c36322be551f0001cf0904fd46e040a73
@@ -22,11 +22,9 @@ long_desc="
  as C++ and Objective C; the runtime facilities of other programming
  languages use the C library to access the underlying operating system."
 
-conf_files="/etc/localtime /etc/ld.so.cache /etc/ld.so.conf /etc/rpc
- /etc/nsswitch.conf"
 base_chroot=yes
 build_depends="gcc-4.3.2 gawk-3.1.6"
-run_depends="xbps-base-dirs-0.1"
+subpackages="base dev libs locale"
 
 pre_configure()
 {