diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbfca8ca..aea3204f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -649,6 +649,10 @@ if (BUILD_TESTING)
 		add_custom_target(cryptest.exe)
 		add_dependencies(cryptest.exe cryptest)
 	endif ()
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+		set_target_properties(cryptest PROPERTIES LINK_FLAGS "-M cryptest.mapfile")
+		file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cryptest.mapfile DESTINATION ${PROJECT_BINARY_DIR})
+	endif ()
 
 	file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/TestData DESTINATION ${PROJECT_BINARY_DIR})
 	file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/TestVectors DESTINATION ${PROJECT_BINARY_DIR})
diff --git a/Filelist.txt b/Filelist.txt
index ee662e0e..911cdc81 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -65,6 +65,7 @@ cryptest.sln
 cryptest.vcxproj
 cryptest.vcxproj.user
 cryptest.vcxproj.filters
+cryptest.mapfile
 cryptest.nmake
 cryptlib.cpp
 cryptlib.h
diff --git a/GNUmakefile b/GNUmakefile
index eced46f6..04ecacf0 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -347,11 +347,7 @@ endif	# IS_X86
 ifeq ($(IS_SUN)$(SUN_COMPILER),11)
 ifneq ($(IS_X86)$(IS_X32)$(IS_X64),000)
 ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
-ifeq ($(wildcard cryptopp.mapfile),)
-$(shell echo "hwcap_1 = SSE SSE2 OVERRIDE;" > cryptopp.mapfile)
-$(shell echo "" >> cryptopp.mapfile)
-endif  # Write mapfile
-LDFLAGS += -M cryptopp.mapfile
+LDFLAGS += -M cryptest.mapfile
 endif  # No CRYPTOPP_DISABLE_ASM
 endif  # X86/X32/X64
 endif  # SunOS
diff --git a/cryptest.mapfile b/cryptest.mapfile
new file mode 100644
index 00000000..e98d9182
--- /dev/null
+++ b/cryptest.mapfile
@@ -0,0 +1 @@
+hwcap_1 = SSE SSE2 OVERRIDE;