diff --git a/templates/glibc/template b/templates/glibc/template
index d066e913f9a..19b52098c05 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -2,9 +2,11 @@
 pkgname=glibc
 sourcepkg=glibc
 version=2.9
-glibc_snapdate=20090209
-wrksrc="$pkgname-$version-$glibc_snapdate"
-distfiles="ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$version-$glibc_snapdate.tar.bz2"
+# Uncomment these lines to use a snapshot from Redhat.
+#glibc_snapdate=20090209
+#wrksrc="$pkgname-$version-$glibc_snapdate"
+#distfiles="ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$version-$glibc_snapdate.tar.bz2"
+distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.gz"
 build_style=gnu_configure
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
@@ -14,7 +16,7 @@ configure_args="--with-tls -disable-profile --with-__thread
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=d5ae995e8a90ffa6ed05e213f3ce4c5c36322be551f0001cf0904fd46e040a73
+checksum=e0210dec2a4ca0a03d8ee26e2a4ebccc915d99f4cdb1489ff0f9f4ce7bda3e30
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
  and is an important part of what makes up a GNU system.  It provides the
@@ -23,7 +25,7 @@ long_desc="
  languages use the C library to access the underlying operating system."
 
 base_chroot=yes
-conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
+conf_files="/etc/rpc /etc/ld.so.conf /etc/ld.so.cache /etc/nsswitch.conf"
 subpackages="devel locales"
 
 Add_dependency build	gcc
@@ -49,7 +51,7 @@ pre_install()
 {
 	# Create destdir/etc/ld.so.conf
 	mkdir -p $XBPS_DESTDIR/$pkgname-$version/etc
-	touch $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf
+	echo "/usr/local/lib" > $XBPS_DESTDIR/$pkgname-$version/etc/ld.so.conf
 }
 
 post_install()