diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fad088..dbba5b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,12 +19,15 @@ message("******************************")
 
 # Is this x86_32?
 if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86" OR
+	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86" OR
 	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_32" OR
+	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86-32" OR
 	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
 	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i486" OR
 	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i586" OR
 	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686" OR
-	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ia32")
+	"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ia32" OR
+	"$ENV{ARCH}" STREQUAL "x86")
 	set(MU_IS_X86_32 YES)
 endif()
 
diff --git a/src/armv5te/CMakeLists.txt b/src/armv5te/CMakeLists.txt
index a525874..3c5c470 100644
--- a/src/armv5te/CMakeLists.txt
+++ b/src/armv5te/CMakeLists.txt
@@ -36,12 +36,12 @@ else()
 	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
 		target_sources(MuCoreArmV5TEExperimental PUBLIC
 			translate_arm.cpp)
+	elseif(MU_IS_X86_32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
+		target_sources(MuCoreArmV5TEExperimental PUBLIC
+			translate_x86.c)
 	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(x86-64)|(amd64)|(AMD64)")
 		target_sources(MuCoreArmV5TEExperimental PUBLIC
 			translate_x86_64.c)
-	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
-		target_sources(MuCoreArmV5TEExperimental PUBLIC
-			translate_x86.c)
 	endif()
 endif()