diff --git a/.cvsignore b/.cvsignore
index cfbc0a2..9684613 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-2.3.3-200405211317.tar.bz2
-glibc-redhat-200405211317.tar.bz2
+glibc-2.3.3-200405280120.tar.bz2
+glibc-redhat-200405280120.tar.bz2
diff --git a/glibc.spec b/glibc.spec
index d3365d6..8366dec 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcrelease 30
+%define glibcrelease 31
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -6,7 +6,7 @@
 %define withtlsarches i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64
 %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9
 %define _unpackaged_files_terminate_build 0
-%define glibcdate 200405211317
+%define glibcdate 200405280120
 Summary: The GNU libc libraries.
 Name: glibc
 Version: 2.3.3
@@ -1219,6 +1219,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri May 28 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-31
+- update from CVS
+- <bits/string2.h> and <bits/mathinline.h> changes for GCC 3.{2,4,5}+
+- make c_stubs buildable even with GCC 3.2.x (#123042)
+
 * Fri May 21 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-30
 - fix pthread_cond_wait on architectures other than IA-32 and
   x86_64
diff --git a/sources b/sources
index 2469e8a..f296ad8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d35de2223577e42a001e45f0864fb9b5  glibc-2.3.3-200405211317.tar.bz2
-a6af6931bd65f396634c6c9f33e606fd  glibc-redhat-200405211317.tar.bz2
+8a30bd0f1490b67eb5ed1901e1a2bce1  glibc-2.3.3-200405280120.tar.bz2
+5f5157f604d8efa6645cc28cb28b112f  glibc-redhat-200405280120.tar.bz2