diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0ffcf09275..a233e08ece 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Thu Nov  7 04:51:19 1991  John Gilmore  (gnu at cygnus.com)
 
+	* am29k-pinsn.c, am29k-opcode.h:  Fix decoding of mtacc, dmac, fmac.
+
 	* tm-*.h:  Remove READ_DBX_FORMAT, COFF_FORMAT, and
 	READ_MIPS_FORMAT, which have been unused since BFD.  Still
 	remaining is COFF_NO_LONG_FILE_NAMES.
diff --git a/gdb/am29k-opcode.h b/gdb/am29k-opcode.h
index 63243f416b..3a32e230c6 100644
--- a/gdb/am29k-opcode.h
+++ b/gdb/am29k-opcode.h
@@ -194,7 +194,7 @@ static struct am29k_opcode am29k_opcodes[] =
 { "mfacc", 0xe9, "c,d,f" },
 { "mfsr", 0xc6, "c,s" },
 { "mftlb", 0xb6, "c,a" },
-{ "mtacc", 0xe8, "c,d,f" },
+{ "mtacc", 0xe8, "a,d,f" },
 { "mtsr", 0xce, "s,b" },
 { "mtsrim", 0x04, "s,x" },
 { "mttlb", 0xbe, "a,b" },
diff --git a/gdb/am29k-pinsn.c b/gdb/am29k-pinsn.c
index 4791348539..d0e18fcb61 100644
--- a/gdb/am29k-pinsn.c
+++ b/gdb/am29k-pinsn.c
@@ -233,11 +233,11 @@ print_insn (memaddr, stream)
 		  break;
 
 		case 'F':
-		  fprintf_filtered (stream, "%d", (insn0 >> 18) & 15);
+		  fprintf_filtered (stream, "%d", (insn16 >> 2) & 15);
 		  break;
 
 		case 'C':
-		  fprintf_filtered (stream, "%d", (insn0 >> 16) & 3);
+		  fprintf_filtered (stream, "%d", insn16 & 3);
 		  break;
 
 		default: