diff --git a/ChangeLog b/ChangeLog
index 74b05c88d92..48a431f14c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-08-30  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* configure.in (opsys): Add pattern *-gnu-linux*
+	* configure.in (opsys): Change pattern to *-*-linux*
 	to recognize powerpc-gnu-linux-uclibc (Bug#9403).
 
 2011-08-26  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/configure.in b/configure.in
index 0f3c88d8d97..80c06eed921 100644
--- a/configure.in
+++ b/configure.in
@@ -410,8 +410,8 @@ dnl quotation begins
 machine='' opsys='' unported=no
 case "${canonical}" in
 
-  ## GNU/Linux ports
-  *-*-linux-gnu* | *-gnu-linux*)
+  ## GNU/Linux and similar ports
+  *-*-linux* )
     opsys=gnu-linux
     case ${canonical} in
       alpha*)	machine=alpha ;;