diff --git a/ChangeLog b/ChangeLog
index b2dd44b563c..4e91b20a35c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.in: Don't pass --with-stabs on IRIX 5 either.
+	* configure: Regenerate.
+
 2004-02-04  Geoffrey Keating  <geoffk@apple.com>
 
 	Merge from upstream:
diff --git a/configure b/configure
index 88d3753ed65..71791ac9e2a 100755
--- a/configure
+++ b/configure
@@ -2011,7 +2011,7 @@ fi
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
   case "${target}" in
-  mips*-*-irix6*)
+  mips*-*-irix[56]*)
     ;;
   mips*-*-* | alpha*-*-osf*)
     with_stabs=yes;
diff --git a/configure.in b/configure.in
index b286f1aa7ef..eb374a45b38 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1250,7 +1250,7 @@ fi
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
   case "${target}" in
-  mips*-*-irix6*)
+  mips*-*-irix[[56]]*)
     ;;
   mips*-*-* | alpha*-*-osf*)
     with_stabs=yes;
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8d1efc61d7b..90ffd18eed4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config/mips/iris5gas.h (PREFERRED_DEBUGGING_TYPE): Define.
+
 2004-02-05  Devang Patel  <dpatel@apple.com>
 
 	* dwarf2out.c (force_type_die): Look up input type itself
diff --git a/gcc/config/mips/iris5gas.h b/gcc/config/mips/iris5gas.h
index e8ffa47fccb..a084e2203da 100644
--- a/gcc/config/mips/iris5gas.h
+++ b/gcc/config/mips/iris5gas.h
@@ -1,4 +1,4 @@
-/* Definitions of target machine for GNU compiler.  Irix version 5 with gas.
+/* Definitions of target machine for GNU compiler.  IRIX version 5 with gas.
    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
@@ -19,6 +19,9 @@
    the Free Software Foundation, 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* Reenable debugging.  */
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+
 /* GNU as does handle DWARF2 directives.  */
 #undef DWARF2_UNWIND_INFO
 #define DWARF2_UNWIND_INFO 1