diff --git a/ChangeLog b/ChangeLog
index 336a933652587a43442bc2e7a6fa9d2f9048f51a..74c792abe61414dd6ef0a94d098266346cb21818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29  Jason Merrill  <jason@casey.cygnus.com>
+
+	* configure.in: -linux-gnu*, not -linux-gnu.
+
 Sun Mar 12 17:30:30 2000  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	* MAINTAINERS: Add self in write-after-approval section.
diff --git a/configure.in b/configure.in
index e4f2a49e842ef4e08bc40fbe44821ef4ff4b98d1..fd56879fe622511038552f6a1252e65e4bf6801b 100644
--- a/configure.in
+++ b/configure.in
@@ -337,7 +337,7 @@ case "${target}" in
   powerpc-*-netware*)
     target_makefile_frag="${target_makefile_frag} config/mt-netware"
     ;;
-  *-*-linux-gnu)
+  *-*-linux-gnu*)
     target_makefile_frag="${target_makefile_frag} config/mt-linux"
     ;;
   *-*-aix4.[3456789]* | *-*-aix[56789].*)
diff --git a/libio/ChangeLog b/libio/ChangeLog
index b15bc38955d6b82dd58a36d0196972c2a6c62a67..6de9007392309e4095f2bf85c6da7ff5beb5dd8b 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29  Jason Merrill  <jason@casey.cygnus.com>
+
+	* configure.in: -linux-gnu*, not -linux-gnu.
+
 2000-01-28  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
 
 	* fstream.h (ifstream::ifstream): Add ios::in to mode.
diff --git a/libio/configure.in b/libio/configure.in
index ea59a13145693717e2b21721ccfaa35ea2e42b28..7c3ff07aef1a13c21331c9f0141c6f265479fd25 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -57,7 +57,7 @@ case "${target}" in
 		 frags="linux.mt linuxaxp1.mt mtsafe.mt" ;;
   *-linux-gnulibc1)
 		 frags=linuxlibc1.mt ;;
-  *-linux-gnu)   frags="linux.mt mtsafe.mt" ;;
+  *-linux-gnu*)  frags="linux.mt mtsafe.mt" ;;
   *-sco3.2v[45]*)   frags=sco4.mt ;;
   *-isc*)        frags=isc.mt ;;
   *-netware*)    frags=netware.mt ;;
@@ -104,7 +104,7 @@ case "${target}" in
     cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h
     cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h
     ;;
-  *-linux-gnu)
+  *-linux-gnu*)
     # We have a correct libc-lock.h in glibc 2.1 but not all glibc 2.0.
     # Create a wrapper if necessary.
     (echo "#include <bits/libc-lock.h>" | ${CC-cc} -E -) >/dev/null 2>&1 ||
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index f4fa0434882a9f1833bba6add54fc558b766fbd5..e5b6fc38e39f3defdb0eff703a68616e96cf14dd 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29  Jason Merrill  <jason@casey.cygnus.com>
+
+	* configure.in: -linux-gnu*, not -linux-gnu.
+
 2000-03-10  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
 
 	* std/bastring.h (basic_string<>::push_back): Was missing.
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 546fdb843c76f2382ebb7b83e2b8e8d964be1011..e87e049a17c7c978798ff10624668ee6c1a90eef 100644
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -90,7 +90,7 @@ fi
 case "${target}" in
   alpha*-*-linux-gnulibc1)	frags="${frags} linux.mt" ;;
   powerpc*-*-linux-gnulibc1)	frags="${frags} linux.mt" ;;
-  *-*-linux-gnu)		frags="${frags} linux.mt" ;;
+  *-*-linux-gnu*)		frags="${frags} linux.mt" ;;
   *-*-openbsd*)		
   	case "x${enable_threads}" in
 		xyes|xposix)	frags="${frags} openbsd.mt" ;;