diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a5a195a090..7b8cb0fca07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  Geoffrey Keating  <geoffk@redhat.com>
+
+	* config/rs6000/sysv4.h (PREFERRED_DEBUGGING_TYPE): Use
+	DWARF2 instead of stabs by default.
+
 2001-08-13  David Edelsohn  <edelsohn@gnu.org>
 
 	* config/rs6000/rs6000.c: Include optabs.h.
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 39813b6409b..773af0671df 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -868,11 +868,11 @@ do {									\
 
 /* This is the end of what might become sysv4.h.  */
 
-/* Allow stabs and dwarf, for now, make stabs the default debugging type,
-   not dwarf since G++ doesn't support dwarf.  */
+/* Use DWARF 2 debugging information by default.  */
 #undef	PREFERRED_DEBUGGING_TYPE
-#define	PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+#define	PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
+/* Historically we have also supported stabs debugging.  */
 #define	DBX_DEBUGGING_INFO
 
 /* If we are referencing a function that is static or is known to be