diff --git a/gdb-6.3-bz182116-exec-from-pthread.patch b/gdb-6.3-bz182116-exec-from-pthread.patch
index 778f2a1..bf7f58c 100644
--- a/gdb-6.3-bz182116-exec-from-pthread.patch
+++ b/gdb-6.3-bz182116-exec-from-pthread.patch
@@ -1,16 +1,12 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182116
 
 
-Index: linux-thread-db.c
+Index: gdb-6.5/gdb/linux-thread-db.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -p -r1.17 -r1.18
---- gdb/linux-thread-db.c	18 Jul 2006 22:53:20 -0000	1.17
-+++ gdb/linux-thread-db.c	24 Jul 2006 18:57:32 -0000	1.18
-@@ -875,6 +875,15 @@ thread_db_wait (ptid_t ptid, struct targ
-   if (ourstatus->kind == TARGET_WAITKIND_EXITED)
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-08-24 02:55:24.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-08-24 02:56:16.000000000 -0300
+@@ -939,6 +939,15 @@ thread_db_wait (ptid_t ptid, struct targ
+       || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
      return pid_to_ptid (-1);
  
 +  if (ourstatus->kind == TARGET_WAITKIND_EXECD)
@@ -23,5 +19,5 @@ diff -u -p -r1.17 -r1.18
 +    }
 +
    if (ourstatus->kind == TARGET_WAITKIND_STOPPED
-       && ourstatus->value.sig == TARGET_SIGNAL_TRAP)
-     /* Check for a thread event.  */
+       && (ourstatus->value.sig == TARGET_SIGNAL_TRAP
+           || ourstatus->value.sig == TARGET_SIGNAL_ILL))
diff --git a/gdb-6.3-bz193763-object-name-completion.patch b/gdb-6.3-bz193763-object-name-completion.patch
index ee494f9..77e2358 100644
--- a/gdb-6.3-bz193763-object-name-completion.patch
+++ b/gdb-6.3-bz193763-object-name-completion.patch
@@ -1,10 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=193763
 
 
-diff -u -r gdb-6.3-old/gdb/linespec.c gdb-6.3/gdb/linespec.c
---- gdb-6.3-old/gdb/linespec.c	2006-06-01 13:43:12.000000000 +0100
-+++ gdb-6.3/gdb/linespec.c	2006-06-01 13:44:14.000000000 +0100
-@@ -293,7 +293,7 @@
+Index: gdb-6.5/gdb/linespec.c
+===================================================================
+--- gdb-6.5.orig/gdb/linespec.c	2006-08-24 02:57:04.000000000 -0300
++++ gdb-6.5/gdb/linespec.c	2006-08-24 02:57:07.000000000 -0300
+@@ -295,7 +295,7 @@ add_minsym_members (const char *class_na
       This will give us a list of all the member names including
       the function signature.  */
    completion_name = xmalloc (strlen (class_name) +
diff --git a/gdb-6.5-bz203661-emit-relocs.patch b/gdb-6.5-bz203661-emit-relocs.patch
index f77232a..e09c888 100644
--- a/gdb-6.5-bz203661-emit-relocs.patch
+++ b/gdb-6.5-bz203661-emit-relocs.patch
@@ -1,6 +1,8 @@
---- sources-clean/gdb/symfile.c	2006-08-23 09:22:21.000000000 +0200
-+++ sources-custom/gdb/symfile.c	2006-08-23 09:54:24.000000000 +0200
-@@ -3713,6 +3713,12 @@
+Index: gdb-6.5/gdb/symfile.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile.c	2006-08-24 02:56:02.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-08-24 02:56:36.000000000 -0300
+@@ -3739,6 +3739,12 @@ symfile_dummy_outputs (bfd *abfd, asecti
  bfd_byte *
  symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
  {
diff --git a/gdb.spec b/gdb.spec
index 6f4adef..f61d013 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -11,7 +11,7 @@ Name: gdb
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 3_jkratoch1%{?dist}
+Release: 5_jkratoch0%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -243,6 +243,9 @@ Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat.patch
 # Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
 Patch188: gdb-6.5-bz203661-emit-relocs.patch
 
+# Add support for memory nops on x86.
+Patch189: gdb-6.5-opcodes-i386-nopmem.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -336,12 +339,13 @@ and printing their data.
 %patch180 -p1
 %patch181 -p1
 %patch182 -p1
-%patch183 -p0
-%patch184 -p0
+%patch183 -p1
+%patch184 -p1
 %patch185 -p1
-%patch186 -p0
-%patch187 -p0
+%patch186 -p1
+%patch187 -p1
 %patch188 -p1
+%patch189 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -502,11 +506,12 @@ fi
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Wed Aug 23 2006 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.5-3_jkratoch1
-- Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
-
-* Sun Aug 20 2006 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.5-3_jkratoch0
-- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048).
+* Thu Aug 24 2006 Alexandre Oliva <aoliva@redhat.com> - 6.5-5
+- Backport support for i386 nop memory instructions.
+- Fix debuginfo addresses resolving for --emit-relocs Linux kernels
+(BZ 203661, from Jan Kratochvil, like the remaining changes).
+- Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ
+200048).
 - Do not step into the PPC solib trampolines (BZ 200533).
 - Fix exec() from threaded program, partial CVS backport (BZ 182116).
 - Fix occasional failure to load shared libraries (BZ 146810).