diff --git a/.cvsignore b/.cvsignore
index 0dca632..f78cd9f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-2.3.3-200406281007.tar.bz2
-glibc-redhat-200406281007.tar.bz2
+glibc-2.3.3-200407050320.tar.bz2
+glibc-redhat-200407050320.tar.bz2
diff --git a/glibc.spec b/glibc.spec
index 2843f6a..b3648b0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcrelease 33
+%define glibcrelease 36
 %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 200406281007
+%define glibcdate 200407050320
 Summary: The GNU libc libraries.
 Name: glibc
 Version: 2.3.3
@@ -20,6 +20,11 @@ Patch1: %{name}-nptl-check.patch
 Patch2: %{name}-ppc-assume.patch
 Patch3: %{name}-execstack-disable.patch
 Patch4: %{name}-ia64-lib64.patch
+Patch5: glibc-ffs.patch
+Patch6: glibc-ppc64-fixes.patch
+Patch7: glibc-nscd-warn.patch
+Patch8: glibc-constraints.patch
+Patch9: glibc-diffarg.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -256,6 +261,11 @@ esac
 %patch4 -p1
 %endif
 %endif
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
@@ -623,7 +633,7 @@ cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/
 ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*`
 cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so`
 ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*`
-cp -a $Pthreads/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-`awk '{ print $2 }' ../$Pthreads/Banner`.so
+cp -a $Pthreads/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.so
 pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir
 ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*`
 popd
@@ -1219,6 +1229,21 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Jul  5 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-36
+- s390* .plt slot reduction
+- fix pthread_rwlock_timedrdlock on x86_64
+- fix ppc64 longjmp/setjmp related exports
+
+* Wed Jun 30 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-35
+- tweak spec file for the libpthread-0.61.so -> libpthread-2.3.3.so
+  NPTL changes
+
+* Wed Jun 30 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-34
+- update from CVS
+  - if_nameindex using preferably netlink
+  - printf_parsemb initialization fix
+  - NPTL version is now the same as glibc version
+
 * Mon Jun 28 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-33
 - update from CVS
   - reread resolv.conf for nscd --invalidate=hosts
diff --git a/sources b/sources
index bad778c..12248a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8c9cd13aa8d4e8f6dc31200f7e6145a7  glibc-2.3.3-200406281007.tar.bz2
-65ea38176941330343de8ddc09133b8f  glibc-redhat-200406281007.tar.bz2
+9eabcff6d6542077b64d5327848574ca  glibc-2.3.3-200407050320.tar.bz2
+f09bf1892febf0924c676e2c674c84e2  glibc-redhat-200407050320.tar.bz2