diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 76cedd7459..d885207b67 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/16305
+	* i386-tdep.c (i386_process_record): Mask out PREFIX_ADDR when
+	adding prefix to opcode.
+
 2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gdb/16304
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 8992088ea0..4f86f0cb1a 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -7048,7 +7048,8 @@ no_support_3dnow_data:
     case 0x0ffc:
     case 0x0ffd:
     case 0x0ffe:
-      switch (prefixes)
+      /* Mask out PREFIX_ADDR.  */
+      switch ((prefixes & ~PREFIX_ADDR))
         {
         case PREFIX_REPNZ:
           opcode |= 0xf20000;