diff --git a/.cvsignore b/.cvsignore
index 7f52f0e..7b80915 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-20071017T2029.tar.bz2
-glibc-fedora-20071017T2029.tar.bz2
+glibc-20071212T1953.tar.bz2
+glibc-fedora-20071212T1953.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index afdbbdf..b7802e0 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1135,7 +1135,7 @@
        time_t next_wait;
        time_t now = time (NULL);
 -      if (e == ETIMEDOUT || now >= dbs[my_number].wakeup_time)
-+      if (e == ETIMEDOUT now >= dbs[my_number].wakeup_time)
++      if (e == ETIMEDOUT || now >= dbs[my_number].wakeup_time)
  	{
  	  next_wait = prune_cache (&dbs[my_number], now, -1);
  	  next_wait = MAX (next_wait, CACHE_PRUNE_INTERVAL);
diff --git a/glibc.spec b/glibc.spec
index a010ac6..9a778c0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,9 +1,9 @@
-%define glibcdate 20071017T2029
+%define glibcdate 20071212T1953
 %define glibcname glibc
-%define glibcsrcdir glibc-20071017T2029
+%define glibcsrcdir glibc-20071212T1953
 %define glibc_release_tarballs 0
-%define glibcversion 2.7
-%define glibcrelease 2
+%define glibcversion 2.7.90
+%define glibcrelease 1
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1015,7 +1015,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Thu Oct 18 2007 Jakub Jelinek <jakub@redhat.com> 2.7-2
+* Wed Dec 12 2007 Jakub Jelinek <jakub@redhat.com> 2.7.90-1
+- update to trunk
+  - fix __USE_STRING_INLINES on i?86 (#408731, #371711)
+  - fix *scanf (#388751)
+
+* Wed Oct 17 2007 Jakub Jelinek <jakub@redhat.com> 2.7-1
 - glibc 2.7 release
 - fix tzfile.c for times after last transition (#333561)
 - fix sem_post@GLIBC_2.0 on i?86
diff --git a/sources b/sources
index 8deb71f..532a825 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6df5a86223b6ee3a300aa50faf723a17  glibc-20071017T2029.tar.bz2
-e67e387b648f9c3355cee8e9a2a900ee  glibc-fedora-20071017T2029.tar.bz2
+93cd34173bf7e65782ec4da34b2e023c  glibc-20071212T1953.tar.bz2
+c0d72136580582021513672bfac9e799  glibc-fedora-20071212T1953.tar.bz2