diff --git a/ChangeLog b/ChangeLog
index 271ed23..b2bac46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-28  Bruno Haible  <bruno@clisp.org>
+	    Ben Elliston  <bje@gnu.org>
+
+        * config.guess: Canonicalize CPU-android-linux to CPU-unknown-
+	linux-android.
+	* testsuite/config-sub.data: Add test cases.
+
 2012-01-28  Sean Keys  <skeys@ipdatasys.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index f73455e..b6f695a 100755
--- a/config.sub
+++ b/config.sub
@@ -132,6 +132,10 @@ case $maybe_os in
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 5c2b419..9f2e8d2 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -4,6 +4,7 @@ amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
 arm-cegcc			arm-unknown-cegcc
 arm-coff			arm-unknown-coff
 arm-elf				arm-unknown-elf
+arm-linux-androideabi		arm-unknown-linux-androideabi
 arm-mingw32ce			arm-unknown-mingw32ce
 arm-riscos			arm-unknown-riscos
 arm-unknown-riscos		arm-unknown-riscos
@@ -66,6 +67,7 @@ i586-auroraux			i586-pc-auroraux
 i586-elf			i586-pc-elf
 i586-rdos			i586-pc-rdos
 i586-skyos			i586-pc-skyos
+i686-android-linux		i686-unknown-linux-android
 i686-dicos			i686-pc-dicos
 i686-elf			i686-pc-elf
 i686-ericsson-dicos		i686-ericsson-dicos