diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca534962d..bf02ea3425 100644
--- a/CMakeLists.txt	
+++ b/CMakeLists.txt
@@ -142,7 +142,11 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
       enable_language(ASM)
     endif()
   elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
+   if(MSVC)
+    enable_language(ASM_MARMASM)
+   else()
     enable_language(ASM_ARMASM)
+   endif()
   else()
     enable_language(ASM_MASM)
   endif()