diff --git a/config/ChangeLog b/config/ChangeLog
index 6711da5bd..fb7a5fd2a 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-01  Robert Millan  <robertmh@gnu.org>
+
+	* mt-linux: Rename to ...
+	* mt-gnu: ... this.
+
 2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
 
 	* acx.m4 (ACX_PROG_LN): From gcc, modified to
diff --git a/config/mt-linux b/config/mt-gnu
similarity index 100%
rename from config/mt-linux
rename to config/mt-gnu
diff --git a/configure b/configure
index 8913e7541..10c8b137f 100755
--- a/configure
+++ b/configure
@@ -1138,8 +1138,8 @@ no)
     ;;
 "")
     case "${target}" in
-    *-*-linux*)
-        # Enable libmudflap by default in GNU/Linux.
+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
+        # Enable libmudflap by default in GNU and friends.
 	;;
     *-*-freebsd*)
         # Enable libmudflap by default in FreeBSD.
@@ -2601,8 +2601,8 @@ case "${target}" in
   powerpc-*-netware*)
     target_makefile_frag="config/mt-netware"
     ;;
-  *-*-linux*)
-    target_makefile_frag="config/mt-linux"
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
+    target_makefile_frag="config/mt-gnu"
     ;;
   *-*-aix4.[3456789]* | *-*-aix[56789].*)
     # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm 
diff --git a/configure.in b/configure.in
index 3c1769351..1a01660c0 100644
--- a/configure.in
+++ b/configure.in
@@ -358,8 +358,8 @@ no)
     ;;
 "")
     case "${target}" in
-    *-*-linux*)
-        # Enable libmudflap by default in GNU/Linux.
+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
+        # Enable libmudflap by default in GNU and friends.
 	;;
     *-*-freebsd*)
         # Enable libmudflap by default in FreeBSD.
@@ -1420,8 +1420,8 @@ case "${target}" in
   powerpc-*-netware*)
     target_makefile_frag="config/mt-netware"
     ;;
-  *-*-linux*)
-    target_makefile_frag="config/mt-linux"
+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
+    target_makefile_frag="config/mt-gnu"
     ;;
   *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*)
     # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm