diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0a53dfbcba..8d0db524bb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  8 10:18:33 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* config/tc-d30v.c (find_format): Test for missing flag and
+	control registers.
+
 Wed Oct  7 14:09:14 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* config/tc-d30v.c (md_apply_fix3): Do not assume that bad
diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index a64e1a5c5a..73dcbe32a9 100644
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -1584,7 +1584,7 @@ find_format (opcode, myops, fsize, cmp_hack)
 		      || ((flags & OPERAND_ACC) && !(num & OPERAND_ACC))
 		      || (!(flags & OPERAND_ACC) && (num & OPERAND_ACC))
 		      || ((flags & OPERAND_FLAG) && !(num & OPERAND_FLAG))
-		      || (!(flags & OPERAND_FLAG) && (num & OPERAND_FLAG))
+		      || (!(flags & (OPERAND_FLAG | OPERAND_CONTROL)) && (num & OPERAND_FLAG))
 		      || ((flags & OPERAND_CONTROL)
 			  && !(num & (OPERAND_CONTROL | OPERAND_FLAG))))
 		    {