diff --git a/src/modules/Java/configure.in b/src/modules/Java/configure.in
index 78454c24552d92bb1646b1c9570fe20570345737..e205b9a1787472afec4cb653795e2615a675c636 100644
--- a/src/modules/Java/configure.in
+++ b/src/modules/Java/configure.in
@@ -66,7 +66,8 @@ if test "x$with_java" = xyes; then
 
     dnl Linux kluge
 
-    if test x"$pike_cv_java_arch" = xunknown; then
+    if test x"$pike_cv_java_arch":"$pike_cv_java_sysos" = xunknown:linux -o
+	    x"$pike_cv_java_arch":"$pike_cv_java_sysos" = xno:linux; then
       [pike_cv_java_arch="`uname -m | sed -e 's/^i[4-9]86/i386/'`"]
     fi
   ])