diff --git a/templates/glibc/build.diff b/templates/glibc/build.diff
index 52fe4fefb52..fd9ecec649e 100644
--- a/templates/glibc/build.diff
+++ b/templates/glibc/build.diff
@@ -1,11 +1,9 @@
-Don't install the timezones, they are provided by the tzdata package.
-
---- Makeconfig.orig
-+++ Makeconfig
-@@ -906,7 +906,7 @@
+--- Makeconfig.orig	2009-06-07 06:17:04.561863100 +0200
++++ Makeconfig	2009-06-07 06:17:43.384890260 +0200
+@@ -918,7 +918,7 @@ all-subdirs = csu assert ctype locale in
  	      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	    \
+ 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
 -	      crypt nss localedata timezone rt conform debug		    \
 +	      crypt nss localedata rt conform debug		    \
  	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
diff --git a/templates/glibc/template b/templates/glibc/template
index 3b923385d14..5c5717dfa10 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -1,14 +1,9 @@
 # Template file for 'glibc'
 pkgname=glibc
-sourcepkg=glibc
-version=2.9
-revision=1
-patch_files="xattr.h-dupdefs.diff thread_db.diff"
-# 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"
+sourcepkg=$pkgname
+version=2.10.1
+patch_files="xattr.h-dupdefs.diff"
+distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 build_style=gnu_configure
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
@@ -19,7 +14,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=e0210dec2a4ca0a03d8ee26e2a4ebccc915d99f4cdb1489ff0f9f4ce7bda3e30
+checksum=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
 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,6 +22,7 @@ long_desc="
  as C++ and Objective C; the runtime facilities of other programming
  languages use the C library to access the underlying operating system."
 
+essential=yes
 base_chroot=yes
 conf_files="/etc/rpc /etc/ld.so.conf /etc/ld.so.cache /etc/nsswitch.conf"
 subpackages="devel locales"
diff --git a/templates/glibc/thread_db.diff b/templates/glibc/thread_db.diff
deleted file mode 100644
index 02df68d760b..00000000000
--- a/templates/glibc/thread_db.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-2009-02-27  Roland McGrath  <roland@redhat.com>
-
-	* init.c (__nptl_initial_report_events): Mark __attribute_used__.
-	* pthread_create.c (__nptl_threads_events, __nptl_last_event): Likewise.
-
-Index: nptl/init.c
-===================================================================
-RCS file: /cvs/glibc/libc/nptl/init.c,v
-retrieving revision 1.78
-diff -u -r1.78 init.c
---- nptl/init.c	29 Jan 2009 20:35:17 -0000	1.78
-+++ nptl/init.c	28 Feb 2009 02:26:34 -0000
-@@ -260,7 +260,7 @@
- 
- 
- /* This can be set by the debugger before initialization is complete.  */
--static bool __nptl_initial_report_events;
-+static bool __nptl_initial_report_events __attribute_used__;
- 
- void
- __pthread_initialize_minimal_internal (void)
-Index: nptl/pthread_create.c
-===================================================================
-RCS file: /cvs/glibc/libc/nptl/pthread_create.c,v
-retrieving revision 1.59
-diff -u -r1.59 pthread_create.c
---- nptl/pthread_create.c	9 Apr 2008 17:58:06 -0000	1.59
-+++ nptl/pthread_create.c	28 Feb 2009 02:26:34 -0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc.
-+/* Copyright (C) 2002-2007,2008,2009 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
- 
-@@ -40,10 +40,10 @@
- int __pthread_debug;
- 
- /* Globally enabled events.  */
--static td_thr_events_t __nptl_threads_events;
-+static td_thr_events_t __nptl_threads_events __attribute_used__;
- 
- /* Pointer to descriptor with the last event.  */
--static struct pthread *__nptl_last_event;
-+static struct pthread *__nptl_last_event __attribute_used__;
- 
- /* Number of threads running.  */
- unsigned int __nptl_nthreads = 1;