diff --git a/templates/glibc.tmpl b/templates/glibc.tmpl
index 0709856edab..f2fa2a0b190 100644
--- a/templates/glibc.tmpl
+++ b/templates/glibc.tmpl
@@ -1,8 +1,9 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.8
-wrksrc="libc"
-distfiles="ftp://ftp.archlinux.org/other/glibc/$pkgname-2.8_20080828.tar.bz2"
+version=2.9
+glibc_snapdate=20081124
+wrksrc="$pkgname-$version-$glibc_snapdate"
+distfiles="ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$version-$glibc_snapdate.tar.bz2"
 build_style=gnu_configure
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
@@ -13,7 +14,7 @@ make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install
  localedata/install-locales"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=f5756668f201e093cae0404e59dcf8c43ccc07757fd0a7455298ed89126c366a
+checksum=cca278180fcd961ed4bcd735b149bd79fa5c01e52abad604e9bfb591e4d7513d
 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
@@ -27,8 +28,8 @@ build_depends="gcc-4.3.2"
 pre_configure()
 {
 	# We must configure it in another directory.
-	mkdir -p $wrksrc/build_obj && cd $wrksrc/build_obj
 	wrksrc=$wrksrc/build_obj
+	mkdir -p $wrksrc
 	echo "slibdir=/lib" > $wrksrc/configparms
 	# glibc fails to build if -march not set for a minimal cpu.
 	if [ "$xbps_machine" != "x86_64" ]; then
@@ -59,5 +60,5 @@ post_install()
 			$destdir/usr/bin/ldd
 	fi
 
-	wrksrc=libc
+	wrksrc=${wrksrc%%/build_obj}
 }