diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7934aa819dc..292aa8fd2ef 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-14  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cris-dis.c (cris_get_disassembler): If abfd is NULL, return
+	print_insn_cris_with_register_prefix.
+
 2000-11-11  Alexandre Oliva  <aoliva@redhat.com>
 
 	* sh-opc.h: The operand of `mov.w r0, (<disp>,GBR)' is IMM1, not 0.
diff --git a/opcodes/cris-dis.c b/opcodes/cris-dis.c
index 169b4c2bf40..44a4b56bd98 100644
--- a/opcodes/cris-dis.c
+++ b/opcodes/cris-dis.c
@@ -1387,7 +1387,10 @@ disassembler_ftype
 cris_get_disassembler (abfd)
      bfd *abfd;
 {
-  if (bfd_get_symbol_leading_char (abfd) == 0)
+  /* If there's no bfd in sight, we return what is valid as input in all
+     contexts if fed back to the assembler: disassembly *with* register
+     prefix.  */
+  if (abfd == NULL || bfd_get_symbol_leading_char (abfd) == 0)
     return print_insn_cris_with_register_prefix;
 
   return print_insn_cris_without_register_prefix;