diff --git a/gas/ChangeLog b/gas/ChangeLog
index e9c34b4315..b625a45bf8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR binutils/941
+	* config/tc-hppa.c (pa_ip): Use as_bad instead of as_fatal when an
+	unknown opcode is found.
+
 2005-10-12  Mark Mitchell  <mark@codesourcery.com>
 
 	* NEWS: Mention @file.
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 7615eb068d..f02e4756f8 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1622,7 +1622,8 @@ pa_ip (str)
       break;
 
     default:
-      as_fatal (_("Unknown opcode: `%s'"), str);
+      as_bad (_("Unknown opcode: `%s'"), str);
+      return;
     }
 
   /* Look up the opcode in the has table.  */