diff --git a/templates/glibc/build.diff b/templates/glibc/build.diff
new file mode 100644
index 00000000000..52fe4fefb52
--- /dev/null
+++ b/templates/glibc/build.diff
@@ -0,0 +1,13 @@
+Don't install the timezones, they are provided by the tzdata package.
+
+--- Makeconfig.orig
++++ Makeconfig
+@@ -906,7 +906,7 @@
+ 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
+ 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
+ 	      gnulib iconv iconvdata wctype manual shadow po argp	    \
+-	      crypt nss localedata timezone rt conform debug		    \
++	      crypt nss localedata rt conform debug		    \
+ 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ 
+ ifndef avoid-generated
diff --git a/templates/glibc/template b/templates/glibc/template
index cb754003675..a3a310af583 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.9
-glibc_snapdate=20081124
+glibc_snapdate=20090209
 wrksrc="$pkgname-$version-$glibc_snapdate"
 distfiles="ftp://sources.redhat.com/pub/glibc/snapshots/$pkgname-$version-$glibc_snapdate.tar.bz2"
 build_style=gnu_configure
@@ -9,12 +9,12 @@ configure_script="../configure"
 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"
+ --libdir=/usr/lib --libexecdir=/usr/lib"
 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=cca278180fcd961ed4bcd735b149bd79fa5c01e52abad604e9bfb591e4d7513d
+checksum=d5ae995e8a90ffa6ed05e213f3ce4c5c36322be551f0001cf0904fd46e040a73
 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