diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3c114f5a593..b66ddcf1103 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 Wed Apr 24 11:28:38 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* config/tc-m68k.c (m68k_ip): Prevent attempts to use long offsets
+ 	in 68000 mode.
+
 	* config/obj-coff.c (obj_coff_section): BFD_ASSEMBLER version:
 	call demand_empty_rest_of_line.  Non BFD_ASSEMBLER version:
 	correct handling of input line pointer, and call
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 947e0aab827..cd70be1207d 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -1743,6 +1743,9 @@ m68k_ip (instring)
 			   && cpu_of_arch (current_architecture) >= m68020)
 			  || opP->disp.size == SIZE_LONG)))
 		{
+		  if (cpu_of_arch (current_architecture) < m68020)
+		    opP->error =
+		      "displacement too large for this architecture; needs 68020 or higher";
 		  if (opP->reg == PC)
 		    tmpreg = 0x3B;	/* 7.3 */
 		  else