diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 27665852b..3270871cd 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A,
+	EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B, EF_M68K_ISA_C): Adjust.
+	(EF_M68K_ISA_A_NODIV, EF_M68K_ISA_B_NOUSP): New.
+	(EF_M68K_HW_DIV, EF_M68K_USP): Remove.
+	(EF_M68K_MAC, EF_M68K_EMAC, EF_M68K_FLOAT): Adjust.
+	(EF_M68K_EMAC_B): New.
+
 2006-03-03  Bjoern Haase  <bjoern.m.haase@web.de>
 
 	* avr.h (R_AVR_MS8_LDI,R_AVR_MS8_LDI_NEG): Add.
diff --git a/include/elf/m68k.h b/include/elf/m68k.h
index 929cd60f4..08d0c4419 100644
--- a/include/elf/m68k.h
+++ b/include/elf/m68k.h
@@ -58,16 +58,18 @@ END_RELOC_NUMBERS (R_68K_max)
 
 /* We use the bottom 8 bits to encode information about the
    coldfire variant.  */
-#define EF_M68K_ISA_MASK	0x07  /* Which ISA */
-#define EF_M68K_ISA_A		0x01
-#define EF_M68K_ISA_A_PLUS	0x02
-#define EF_M68K_ISA_B		0x03
-#define EF_M68K_HW_DIV		0x08  /* Has HW divide */
+#define EF_M68K_ISA_MASK	0x0F  /* Which ISA */
+#define EF_M68K_ISA_A_NODIV	0x01  /* ISA A except for div */
+#define EF_M68K_ISA_A		0x02
+#define EF_M68K_ISA_A_PLUS	0x03
+#define EF_M68K_ISA_B_NOUSP	0x04  /* ISA_B except for USP */
+#define EF_M68K_ISA_B		0x05
+#define EF_M68K_ISA_C		0x06
 #define EF_M68K_MAC_MASK	0x30 
-#define EF_M68K_MAC		0x10  /* Has MAC */
-#define EF_M68K_EMAC		0x20  /* Has EMAC */
-#define EF_M68K_USP		0x40  /* Has USP insns */
-#define EF_M68K_FLOAT		0x80  /* Has float insns */
+#define EF_M68K_MAC		0x10  /* MAC */
+#define EF_M68K_EMAC		0x20  /* EMAC */
+#define EF_M68K_EMAC_B		0x30  /* EMAC_B */
+#define EF_M68K_FLOAT		0x40  /* Has float insns */
 #define EF_M68K_CF_MASK		0xFF
      
 #endif