diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f8ee3b2b5..3a9949dd1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-30  Mark Kettenis  <kettenis@gnu.org>
 
+	* config/i386/tm-i386sol2.h (STAB_REG_TO_REGNUM): Redefine to call
+	i386_dwarf_reg_to_regnum.
+
 	* i386-tdep.c (i386_register_convert_to_virtual): Replace
 	assertion with a warning if we're asked to convert towards a
 	non-floating-point type.  Zero out the the buffer where the data
diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
index bc2a5f8b81..c90e0d475a 100644
--- a/gdb/config/i386/tm-i386sol2.h
+++ b/gdb/config/i386/tm-i386sol2.h
@@ -24,6 +24,11 @@
 #define HAVE_I387_REGS
 #include "i386/tm-i386v4.h"
 
+/* We use stabs-in-ELF with the DWARF register numbering scheme.  */
+
+#undef STAB_REG_TO_REGNUM
+#define STAB_REG_TO_REGNUM(reg) i386_dwarf_reg_to_regnum ((reg))
+
 /* If the current gcc for for this target does not produce correct
    debugging information for float parameters, both prototyped and
    unprototyped, then define this macro.  This forces gdb to always