diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6a7554..af287a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,7 +289,7 @@ if(ENABLE_ASM)
 		endif()
 	elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
 		set(HOST_ASM_MACOSX_X86_64 true)
-	elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64" AND FALSE)
+	elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64")
 		# XXX Disabled for now, CMake's MASM support seems to either never
 		# build supply ASM or build it with the C compiler in a mode where it
 		# does not parse correctly. It might be easier to get NASM support working.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 0d65874..e1b9287 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
 	add_definitions(-DWHIRLPOOL_ASM)
 	add_definitions(-DOPENSSL_CPUID_OBJ)
 	set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
-	set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C)
+	set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
 endif()
 
 if(HOST_ASM_MINGW64_X86_64)