diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7c6f076c..370b891d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,8 +183,7 @@ else ()
   message (STATUS "INFO - Override arch is ${DETECTED_ARCH}")
 endif()
 
-if (DETECTED_ARCH STREQUAL "i586" OR DETECTED_ARCH STREQUAL "x86_64"
-    OR DETECTED_ARCH STREQUAL "i386")
+if (DETECTED_ARCH MATCHES "i?86" OR DETECTED_ARCH STREQUAL "x86_64")
   set (X86PLAT ON)
 elseif (DETECTED_ARCH MATCHES "arm.*" OR DETECTED_ARCH MATCHES "aarch64")
   set (ARMPLAT ON)