diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index df9cd36e0a..90c73980f9 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -6,6 +6,7 @@ Please mark all change in change log and use the ticket from JIRA.
 
 ## Bug
 - MS-80 - Fix server hang issue
+- MS-90 - Fix arch match incorrect on ARM
 
 ## Improvement
 - MS-82 - Update server startup welcome message
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index b7d33ea9ad..b4743de7cd 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -101,7 +101,8 @@ else()
             )
 endif ()
 
-if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+
+if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     set(engine_libs
 	    ${engine_libs}
 	    libquadmath.a