diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh
index 650d2854..306dbcaa 100644
--- a/misc/setup/Solaris_pkg.sh
+++ b/misc/setup/Solaris_pkg.sh
@@ -11,7 +11,7 @@ fi
 
 
 if [ "X`uname -m`" = "Xi86pc" ]; then
-	ARCH=i386
+	ARCH=x86
 else
 	ARCH=sparc
 fi
@@ -94,7 +94,7 @@ if [ -d ${BUILD_DIR} ]; then
 		fi
 	done
 
-	for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamei386.so qagamei386.so uii386.so
+	for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamex86.so qagamex86.so uix86.so
 	do
 		if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
         		${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO} ${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
diff --git a/misc/setup/doit b/misc/setup/doit
index 2e082ba7..010dc480 100755
--- a/misc/setup/doit
+++ b/misc/setup/doit
@@ -46,8 +46,8 @@ archs=()
 for arch in $topdir/build/release-*; do
 	arch=${arch##*-}
 	case "$arch" in
-		i386) echo "define(HAVE_I386,yes)dnl" >> defines.m4
-			copystartscript x86
+		x86) echo "define(HAVE_X86,yes)dnl" >> defines.m4
+			copystartscript $arch
 		;;
 		x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
 			copystartscript $arch
diff --git a/misc/setup/ioq3demo.sh b/misc/setup/ioq3demo.sh
index 05df7ff8..b7102241 100644
--- a/misc/setup/ioq3demo.sh
+++ b/misc/setup/ioq3demo.sh
@@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
 
 archs=`uname -m`
 case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
+	i?86) archs=x86 ;;
+	x86_64) archs="x86_64 x86" ;;
 	ppc64) archs="ppc64 ppc" ;;
 esac
 
diff --git a/misc/setup/ioquake3.SlackBuild b/misc/setup/ioquake3.SlackBuild
index 187d58b5..e48d0d37 100644
--- a/misc/setup/ioquake3.SlackBuild
+++ b/misc/setup/ioquake3.SlackBuild
@@ -24,9 +24,9 @@ PKG_VERSION=$VERSION
 ARCH=${ARCH:-i586}
 
 if [ "$ARCH" = "i?86" ]; then
-  ARCHSUFFIX="i386"
+  ARCHSUFFIX="x86"
 elif [ "$ARCH" = "x86_64" ]; then
-  ARCHSUFFIX="64"
+  ARCHSUFFIX="x86_64"
 fi
 
 BUILD=${BUILD:-1_io}
diff --git a/misc/setup/ioquake3.sh b/misc/setup/ioquake3.sh
index fbef5676..6ebc4d17 100644
--- a/misc/setup/ioquake3.sh
+++ b/misc/setup/ioquake3.sh
@@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
 
 archs=`uname -m`
 case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
+	i?86) archs=x86 ;;
+	x86_64) archs="x86_64 x86" ;;
 	ppc64) archs="ppc64 ppc" ;;
 esac
 
diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
index 511f4fb5..2df63682 100644
--- a/misc/setup/pkg/ioq3ded.sh
+++ b/misc/setup/pkg/ioq3ded.sh
@@ -13,7 +13,7 @@ fi
 export LD_LIBRARY_PATH
 
 COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
+COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
 
 EXEC_REL=release
 
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
index 29a050b7..fdc78160 100644
--- a/misc/setup/pkg/ioquake3.sh
+++ b/misc/setup/pkg/ioquake3.sh
@@ -13,7 +13,7 @@ fi
 export LD_LIBRARY_PATH
 
 COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
+COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
 
 EXEC_REL=release
 
diff --git a/misc/setup/setup.xml.in b/misc/setup/setup.xml.in
index b8201018..4b076755 100644
--- a/misc/setup/setup.xml.in
+++ b/misc/setup/setup.xml.in
@@ -24,12 +24,12 @@ ifelse(HAVE_X86_64,yes,dnl
      <help>you need the binaries to play the game</help>
     </option>
 )dnl
-ifelse(HAVE_I386,yes,dnl
+ifelse(HAVE_X86,yes,dnl
     <option install="true" if="|(x86,x86_64)">
      ioq3 x86 (32 bit) binaries
      <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
      <files>
-       ioquake3.i386.tar
+       ioquake3.x86.tar
      </files>
      <help>you need the binaries to play the game</help>
     </option>