diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b37252fafab..7b07733abb6 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 31 16:46:26 2001  Jeffrey A Law  (law@redhat.com)
+
+	* hppa-dis.c (print_insn_hppa): Handle new 'c' mode completers,
+	'X', 'M', and 'A'.  No longer emit a space after 'x' or 's'.
+	Always emit a space after 'H'.
+
 2001-12-18  matthew green  <mrg@redhat.com>
 
 	* ppc-opc.c (PPCVEC): Include PPC_OPCODE_ANY.
diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
index 6d7c54deb9e..d9ab9dd99d5 100644
--- a/opcodes/hppa-dis.c
+++ b/opcodes/hppa-dis.c
@@ -554,17 +554,29 @@ print_insn_hppa (memaddr, info)
 		  switch (*++s)
 		    {
 		    case 'x':
+		      (*info->fprintf_func) (info->stream, "%s",
+					     index_compl_names[GET_COMPL (insn)]);
+		      break;
+		    case 'X':
 		      (*info->fprintf_func) (info->stream, "%s ",
 					     index_compl_names[GET_COMPL (insn)]);
 		      break;
 		    case 'm':
+		      (*info->fprintf_func) (info->stream, "%s",
+					     short_ldst_compl_names[GET_COMPL (insn)]);
+		      break;
+		    case 'M':
 		      (*info->fprintf_func) (info->stream, "%s ",
 					     short_ldst_compl_names[GET_COMPL (insn)]);
 		      break;
-		    case 's':
+		    case 'A':
 		      (*info->fprintf_func) (info->stream, "%s ",
 					     short_bytes_compl_names[GET_COMPL (insn)]);
 		      break;
+		    case 's':
+		      (*info->fprintf_func) (info->stream, "%s",
+					     short_bytes_compl_names[GET_COMPL (insn)]);
+		      break;
 		    case 'c':
 		    case 'C':
 		      switch (GET_FIELD (insn, 20, 21))
@@ -686,7 +698,7 @@ print_insn_hppa (memaddr, info)
 		      break;
 		    case 'H':
 		      (*info->fprintf_func)
-			  (info->stream, "%s", saturation_names[GET_FIELD
+			  (info->stream, "%s ", saturation_names[GET_FIELD
 							       (insn, 24, 25)]);
 		      break;
 		    case '*':