diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d09290b798..eb8120bb06 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-19  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* s390-dis.c (init_disasm): Use renamed architecture defines.
+
 2002-02-19  matthew green  <mrg@redhat.com>
 
 	* ppc-opc.c (powerpc_dialect): Fix comment; BookE is not Motorola
diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index 0ddaaf1782..2f2311bed4 100644
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -53,10 +53,10 @@ init_disasm (info)
     }
   switch (info->mach)
     {
-    case bfd_mach_s390_esa:
+    case bfd_mach_s390_31:
       current_arch_mask = 1 << S390_OPCODE_ESA;
       break;
-    case bfd_mach_s390_esame:
+    case bfd_mach_s390_64:
       current_arch_mask = 1 << S390_OPCODE_ESAME;
       break;
     default: