diff --git a/client/Mac/cli/CMakeLists.txt b/client/Mac/cli/CMakeLists.txt
index 900fbade6..2704fb13d 100644
--- a/client/Mac/cli/CMakeLists.txt
+++ b/client/Mac/cli/CMakeLists.txt
@@ -67,7 +67,7 @@ add_executable(${PROJECT_NAME}
         ${RESOURCES})
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
 endif()
 set_target_properties(${PROJECT_NAME} PROPERTIES RESOURCE "${RESOURCES}")
 set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
diff --git a/client/SDL/CMakeLists.txt b/client/SDL/CMakeLists.txt
index f3b4cee2f..6f2d7aca8 100644
--- a/client/SDL/CMakeLists.txt
+++ b/client/SDL/CMakeLists.txt
@@ -118,7 +118,7 @@ add_executable(${PROJECT_NAME}
     )
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
 endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "Client/SDL")
diff --git a/client/Sample/CMakeLists.txt b/client/Sample/CMakeLists.txt
index d4ec9c89e..4a4f9e586 100644
--- a/client/Sample/CMakeLists.txt
+++ b/client/Sample/CMakeLists.txt
@@ -83,7 +83,7 @@ set(LIBS
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
 endif()
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "Client/Sample")
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
diff --git a/client/Wayland/CMakeLists.txt b/client/Wayland/CMakeLists.txt
index 8112053aa..7076ff150 100644
--- a/client/Wayland/CMakeLists.txt
+++ b/client/Wayland/CMakeLists.txt
@@ -50,7 +50,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 set(MANPAGE_NAME ${MODULE_NAME})
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 	set(MANPAGE_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
 endif()
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index ee0d83771..0695ed6e1 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -94,9 +94,9 @@ else()
 	add_executable(${MODULE_NAME} ${WIN32_GUI_FLAG} ${${MODULE_PREFIX}_SRCS})
 	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 	if (WITH_BINARY_VERSIONING)
-		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 	else()
-		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
+		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}")
 	endif()
 endif()
 
diff --git a/client/Windows/cli/CMakeLists.txt b/client/Windows/cli/CMakeLists.txt
index de5bb3fcd..d418ff3e8 100644
--- a/client/Windows/cli/CMakeLists.txt
+++ b/client/Windows/cli/CMakeLists.txt
@@ -43,7 +43,7 @@ endif()
 add_executable(${MODULE_NAME} ${WIN32_GUI_FLAG} ${${MODULE_PREFIX}_SRCS})
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${PROJECT_VERSION_MAJOR}")
 endif()
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} wfreerdp-client)
 
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index 144608ee0..b14754935 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -114,7 +114,7 @@ else()
 	)
 	add_executable(${PROJECT_NAME} ${SRCS})
 	if (WITH_BINARY_VERSIONING)
-		set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+		set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${PROJECT_VERSION_MAJOR}")
 	endif()
 	include_directories(..)
 endif()
diff --git a/client/X11/cli/CMakeLists.txt b/client/X11/cli/CMakeLists.txt
index 09bcfd7f4..580337b34 100644
--- a/client/X11/cli/CMakeLists.txt
+++ b/client/X11/cli/CMakeLists.txt
@@ -25,9 +25,9 @@ set(SRCS
 add_executable(${MODULE_NAME} ${SRCS})
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp${PROJECT_VERSION_MAJOR}")
 else()
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp")
 endif()
 set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "..")
 
diff --git a/client/iOS/CMakeLists.txt b/client/iOS/CMakeLists.txt
index 6e4237f83..163281e73 100644
--- a/client/iOS/CMakeLists.txt
+++ b/client/iOS/CMakeLists.txt
@@ -121,7 +121,7 @@ add_executable(${MODULE_NAME}
 	)
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${PROJECT_VERSION_MAJOR}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${PROJECT_VERSION_MAJOR}")
 endif()
 set_target_properties(${MODULE_NAME} PROPERTIES RESOURCE "${${MODULE_NAME}_RESOURCES}")
 
diff --git a/rdtk/sample/CMakeLists.txt b/rdtk/sample/CMakeLists.txt
index 0568f8e9d..1b4f025c0 100644
--- a/rdtk/sample/CMakeLists.txt
+++ b/rdtk/sample/CMakeLists.txt
@@ -27,7 +27,7 @@ set(SRCS
 
 add_executable(${MODULE_NAME} ${SRCS})
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${RDTK_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${RDTK_API_VERSION}")
 endif()
 
 set(LIBS rdtk)
diff --git a/server/Mac/CMakeLists.txt b/server/Mac/CMakeLists.txt
index 49f6535ac..9dddb387f 100644
--- a/server/Mac/CMakeLists.txt
+++ b/server/Mac/CMakeLists.txt
@@ -57,7 +57,7 @@ endif()
 	
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 endif()
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} 
diff --git a/server/Sample/CMakeLists.txt b/server/Sample/CMakeLists.txt
index 5820dafe9..866585c38 100644
--- a/server/Sample/CMakeLists.txt
+++ b/server/Sample/CMakeLists.txt
@@ -53,7 +53,7 @@ file(COPY test_icon.ppm DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(${MODULE_NAME} ${SRCS})
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 endif()
 
 list(APPEND LIBS freerdp-server)
diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
index 7ead2b254..2744b65d0 100644
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -90,7 +90,7 @@ else()
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/wfreerdp.c cli/wfreerdp.h)
 	add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 	if (WITH_BINARY_VERSIONING)
-		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+		set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 	endif()
 endif()
 
diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
index 409728007..e125ac3cf 100644
--- a/server/Windows/cli/CMakeLists.txt
+++ b/server/Windows/cli/CMakeLists.txt
@@ -42,9 +42,9 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}${FREERDP_API_VERSION}")
 else()
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}")
 endif()
 
 set(${MODULE_PREFIX}_LIBS wfreerdp-server)
diff --git a/server/proxy/cli/CMakeLists.txt b/server/proxy/cli/CMakeLists.txt
index 79333a951..1416b4a86 100644
--- a/server/proxy/cli/CMakeLists.txt
+++ b/server/proxy/cli/CMakeLists.txt
@@ -43,7 +43,7 @@ set(MANPAGE_NAME ${APP_NAME}.1)
 if (WITH_BINARY_VERSIONING)
 	set_target_properties(${APP_NAME}
 	       	PROPERTIES
-	       	OUTPUT_NAME "${APP_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}"
+	       	OUTPUT_NAME "${APP_NAME}${FREERDP_API_VERSION}"
 	)
 	set(MANPAGE_NAME ${APP_NAME}${FREERDP_API_VERSION}.1)
 endif()
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 94aa20613..7ca4e7d7c 100644
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -204,7 +204,7 @@ add_executable(${MODULE_NAME} ${SRCS})
 
 set(MANPAGE_NAME "${MODULE_NAME}")
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 	set(MANPAGE_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 endif()
 
diff --git a/winpr/tools/hash-cli/CMakeLists.txt b/winpr/tools/hash-cli/CMakeLists.txt
index 0e5aca8b8..8f583d363 100644
--- a/winpr/tools/hash-cli/CMakeLists.txt
+++ b/winpr/tools/hash-cli/CMakeLists.txt
@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr)
 
 set(MANPAGE_NAME "${MODULE_NAME}")
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}")
         set(MANPAGE_NAME "${MODULE_NAME}${WINPR_API_VERSION}")
 endif()
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt
index c5b2b535e..e92d6f2e3 100644
--- a/winpr/tools/makecert-cli/CMakeLists.txt
+++ b/winpr/tools/makecert-cli/CMakeLists.txt
@@ -48,7 +48,7 @@ set(MANPAGE_NAME ${MODULE_NAME})
 if (WITH_BINARY_VERSIONING)
 	set_target_properties(${MODULE_NAME}
 	       	PROPERTIES
-	       	OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}"
+	       	OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}"
 	)
 	set(MANPAGE_NAME ${MODULE_NAME}${WINPR_API_VERSION})
 endif()