diff --git a/ChangeLog b/ChangeLog
index 01aa242178b55a676844ecaae99249ae8d1d67c2..723e98e261dba66dfbe4a80081242af07274e203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-23  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac (asm_path): Recognize "x86", in addition to "i?86",
+	for 32-bit x86 processors. Reportedly needed for x86 android builds.
+
 2018-01-20  Niels Möller  <nisse@lysator.liu.se>
 
 	CFB8 support, contributed by Dmitry Eremin-Solenikov.
diff --git a/configure.ac b/configure.ac
index 8fb1cb2aa40da2091ef380830fa4ca7423fa4f12..41bf0998b7e52e8dd8d4ec433bf2652929b457b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,7 +396,7 @@ OPT_NETTLE_SOURCES=""
 asm_path=
 if test "x$enable_assembler" = xyes ; then
   case "$host_cpu" in
-    [i?86* | k[5-8]* | pentium* | athlon])
+    [x86 | i?86* | k[5-8]* | pentium* | athlon])
       asm_path=x86
       ;;
     [x86_64 | amd64])