diff --git a/gdb.spec b/gdb.spec
index 3902418..47a92b9 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -6,7 +6,7 @@ Summary: A GNU source-level debugger for C, C++ and other languages.
 Name: gdb
 # Daily snapshot of gdb taken from FSF mainline cvs, after the 6.1 branchpoint.
 Version: 6.1post
-Release: 1.%{cvsdate}.3.1
+Release: 1.%{cvsdate}.8
 License: GPL
 Group: Development/Debuggers
 Source: ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb+dejagnu-20040607.tar.bz2
@@ -24,14 +24,32 @@ Patch0: gdb-6.1post-ChangeLog.patch
 # ChangeLogs patches for testsuite.
 Patch1: gdb-6.1post-ChangeLog-testsuite.patch
 ####### start patches from the previous RPM.
-# Changes to the testsuite that are Red Hat specific.
-Patch2: gdb-6.1post-testsuite.patch
 # New test to see if libunwind is used. (Red Hat specific)
 Patch3: gdb-6.1post-libunwind-tst.patch
 # Silence gcc warnings.
 Patch4: gdb-6.1post-gccwarn.patch
+
 ####### end patches from the previous RPM.
-Patch5: gdb-6.0post-pie-mar2004.patch
+
+####### Signal trampoline fixes
+Patch10: gdb-6.1post-sig-ppc-jun2004.patch
+Patch11: gdb-6.1post-sig-symtramp-jun2004.patch
+Patch12: gdb-6.1post-sig-x86-jun2004.patch
+
+####### ABI fixes and updates
+Patch20: gdb-6.1post-abi-ppc64-jun2004.patch
+Patch21: gdb-6.1post-abi-ppc64syscall-jun2004.patch
+
+###### Testsuite merge, fixes, and local RH hack
+Patch30: gdb-6.1post-test-rh.patch
+Patch31: gdb-6.1post-testsuite-20040621.patch
+Patch32: gdb-6.1post-test-sizeof-jun2004.patch
+Patch33: gdb-6.1post-test-signull-jun2004.patch
+Patch34: gdb-6.1post-test-step-jun2004.patch
+Patch35: gdb-6.1post-test-enadisbr-jun2004.patch
+Patch36: gdb-6.1post-test-observer-jun2004.patch
+Patch37: gdb-6.1post-test-bigcore-jun2004.patch
+Patch38: gdb-6.1post-test-sigbpt-jun2004.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 
@@ -53,10 +71,25 @@ printing their data.
 # Apply patches defined above.
 %patch0 -p1 
 %patch1 -p1 
-%patch2 -p1 
 %patch3 -p1 
 %patch4 -p1
-%patch5 -p1
+
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
+%patch20 -p1
+%patch21 -p1
+
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -141,7 +174,13 @@ ld -v
 echo ====================TESTING=========================
 cd gdb/testsuite
 make -k check || :
-test -r gdb.log && cat gdb.log | bzip2 -1 | uuencode gdb-%{_target_platform}.log.bz2 || :
+for t in sum log; do
+  ln gdb.$t gdb-%{_target_platform}.$t || :
+done
+tar cf - gdb-%{_target_platform}.{sum,log} \
+	| bzip2 -1 \
+	| uuencode gdb-%{_target_platform}.tar.bz2 \
+	|| :
 cd ../..
 echo ====================TESTING END=====================
 %endif
@@ -226,6 +265,32 @@ fi
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Wed Jun 23 2004 Andrew Cagney <cagney@redhat.com>     1.200400607.8
+- Do not xfail signals on i387, convert KFAIL to FAIL and not XFAIL.
+
+* Wed Jun 23 2004 Andrew Cagney <cagney@redhat.com>     1.200400607.7
+- Fix to ppc64 unwinder - handle glibcs function within syscall
+  function hack.
+- Update sigbpt.exp, ena-dis-br.exp observer.exp signull.exp,
+  step-test.exp and sizeof.exp, so that test names are architecture
+  clean.
+- Disable bigcore.exp on PowerPC 64.
+
+* Tue Jun 22 2004 Andrew Cagney <cagney@redhat.com>     1.200400607.6
+- Merge in mainline testsuite changes up to 2004-06-21.
+- Re-implement 32 and 64-bit PPC signal trampolines.
+- Check i386 and amd64 signal trampolines before dwarf2.
+- Allow tramp-frame when there is a symbol.
+- Test interaction between single-step, breakpoint and signal.
+- ABI: Fix PPC64 function parameters, sizeof long-double, and enum
+  return values.
+
+* Mon Jun 21 2004 Elena Zannoni <ezannoni@redhat.com>	1.200400607.5
+- Fix sed line for gz info files.
+
+* Mon Jun 21 2004 Andrew Cagney <cagney@redhat.com>	1.200400607.4
+- Tar/uuencode both the .sum and .log test results.
+
 * Tue Jun 15 2004 Elena Zannoni <ezannoni@redhat.com>	0.200400607.3
 - Remove installation of mmalloc, and its info files.
 - Add hack to deal with differring info files generated by makeinfo.