diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1db4dfa..566a7dcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -568,11 +568,22 @@ install(FILES ${hs_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hs")
 set (hs_exec_common_SRCS
     src/alloc.c
     src/scratch.c
-    src/util/arch/x86/cpuid_flags.c
     src/util/arch/common/cpuid_flags.h
     src/util/multibit.c
     )
 
+if (ARCH_IA32 OR ARCH_X86_64)
+set (hs_exec_common_SRCS
+    ${hs_exec_common_SRCS}
+    src/util/arch/x86/cpuid_flags.c
+    )
+elif (ARCH_ARM32 OR ARCH_AARCH64)
+set (hs_exec_common_SRCS
+    ${hs_exec_common_SRCS}
+    src/util/arch/arm/cpuid_flags.c
+    )
+endif ()
+
 set (hs_exec_SRCS
     ${hs_HEADERS}
     src/hs_version.h
diff --git a/src/hs_valid_platform.c b/src/hs_valid_platform.c
index 7a022607..b187090b 100644
--- a/src/hs_valid_platform.c
+++ b/src/hs_valid_platform.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include "hs_common.h"
+#include "ue2common.h"
 #if defined(ARCH_X86_64)
 #include "util/arch/x86/cpuid_inline.h"
 #endif
@@ -35,9 +36,13 @@
 HS_PUBLIC_API
 hs_error_t HS_CDECL hs_valid_platform(void) {
     /* Hyperscan requires SSSE3, anything else is a bonus */
+#if defined(ARCH_IA32) || defined(ARCH_X86_64)
     if (check_ssse3()) {
         return HS_SUCCESS;
     } else {
         return HS_ARCH_ERROR;
     }
+#elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
+    return HS_SUCCESS;
+#endif
 }
diff --git a/src/util/arch/arm/cpuid_flags.c b/src/util/arch/arm/cpuid_flags.c
new file mode 100644
index 00000000..8dbab473
--- /dev/null
+++ b/src/util/arch/arm/cpuid_flags.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015-2017, Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  * Neither the name of Intel Corporation nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "cpuid_flags.h"
+#include "ue2common.h"
+#include "hs_compile.h" // for HS_MODE_ flags
+#include "util/arch.h"
+
+u64a cpuid_flags(void) {
+     return cap;
+}
+
+u32 cpuid_tune(void) {
+    return HS_TUNE_FAMILY_GENERIC;
+}