diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index b007b1155181fcbc55174630dbcc7320e63af933..13543eccc2be5e37ff3e2bbe0ff1780db16707a0 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -7,6 +7,7 @@ Please mark all change in change log and use the ticket from JIRA.
 ## Bug
 - MS-80 - Fix server hang issue
 - MS-89 - Fix compile failed, libgpufaiss.a link missing
+- 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 4826ff2706edba93f270f35ba9109521040a63b5..a76986de3481cb081e3f967720c636d0029e11fd 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -102,7 +102,8 @@ else()
             )
 endif ()
 
-if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+
+if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     set(engine_libs
 	    ${engine_libs}
 	    libquadmath.a