Index: icedtea-2.1/acinclude.m4
===================================================================
--- icedtea-2.1.orig/acinclude.m4
+++ icedtea-2.1/acinclude.m4
@@ -8,9 +8,9 @@ AC_DEFUN([IT_SET_ARCH_SETTINGS],
       ARCHFLAG="-m64"
       ;;
     i?86)
-      BUILD_ARCH_DIR=i586
-      INSTALL_ARCH_DIR=i386
-      JRE_ARCH_DIR=i386
+      BUILD_ARCH_DIR=x86
+      INSTALL_ARCH_DIR=x86
+      JRE_ARCH_DIR=x86
       ARCH_PREFIX=${LINUX32}
       ARCHFLAG="-m32"
       ;;
@@ -700,7 +700,7 @@ AC_DEFUN([IT_ENABLE_ZERO_BUILD],
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in
-    i386|ppc|s390|sparc)
+    x86|ppc|s390|sparc)
       ZERO_BITSPERWORD=32
       ;;
     amd64|ppc64|s390x|sparc64)
@@ -712,7 +712,7 @@ AC_DEFUN([IT_ENABLE_ZERO_BUILD],
   esac
   AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
   case "${ZERO_LIBARCH}" in
-    i386)
+    x86)
       ZERO_ARCHDEF="IA32"
       ;;
     ppc*)