diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b6602c38a8..cca6d23a1e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-09  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* configure.in: Correct --help text for --with-dwarf2.
+	Put tm-dwarf2.h after other tm files, if it's requested.
+	* configure: Regenerate.
+	* config/tm-dwarf2.h: #undef PREFERRED_DEBUGGING_TYPE before
+	defining it.
+
 2000-02-09  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* cpplib.h: Provide HASHNODE typedef and forward decl of
diff --git a/gcc/config/tm-dwarf2.h b/gcc/config/tm-dwarf2.h
index a580964ba1a..d08646eccf8 100644
--- a/gcc/config/tm-dwarf2.h
+++ b/gcc/config/tm-dwarf2.h
@@ -1,4 +1,4 @@
 /* Enable Dwarf2 debugging and make it the default */
 #define  DWARF2_DEBUGGING_INFO 1
+#undef	 PREFERRED_DEBUGGING_TYPE
 #define  PREFERRED_DEBUGGING_TYPE  DWARF2_DEBUG
-
diff --git a/gcc/configure b/gcc/configure
index 50094d03873..2065a7f40c7 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -58,7 +58,7 @@ ac_help="$ac_help
   --enable-objc-gc	  enable the use of Boehm's garbage collector with
 			  the GNU Objective-C runtime."
 ac_help="$ac_help
-  --enable-dwarf2	  enable DWARF2 debugging as default."
+  --with-dwarf2	  force the default debug format to be DWARF2."
 ac_help="$ac_help
   --enable-nls            use Native Language Support (disabled by default)"
 ac_help="$ac_help
@@ -6447,7 +6447,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x
diff --git a/gcc/configure.in b/gcc/configure.in
index e2b9535fa32..415fff30f2f 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -295,7 +295,7 @@ fi,
 objc_boehm_gc='')
 
 AC_ARG_WITH(dwarf2,
-[  --enable-dwarf2	  enable DWARF2 debugging as default.],
+[  --with-dwarf2	  force the default debug format to be DWARF2.],
 dwarf2="$with_dwarf2",
 dwarf2=no)
 
@@ -3844,7 +3844,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x