diff --git a/client/SDL/SDL2/CMakeLists.txt b/client/SDL/SDL2/CMakeLists.txt
index 8291b4100..684d2eb2e 100644
--- a/client/SDL/SDL2/CMakeLists.txt
+++ b/client/SDL/SDL2/CMakeLists.txt
@@ -62,17 +62,18 @@ else()
     list(APPEND LIBS ${SDL2_LIBRARIES})
 endif()
 
-AddTargetWithResourceFile(${MODULE_NAME} "${WIN32_GUI_FLAG}" "${PROJECT_VERSION}" SRCS)
+AddTargetWithResourceFile(${MODULE_NAME} TRUE "${PROJECT_VERSION}" SRCS)
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/SDL")
 
 if (NOT WITH_CLIENT_SDL_VERSIONED)
-	set_target_properties(${MODULE_NAME}
-		PROPERTIES
-		OUTPUT_NAME ${PROJECT_NAME}
-	)
+    get_target_property(OUT_NAME ${MODULE_NAME} OUTPUT_NAME)
+    string(REPLACE "${MODULE_NAME}" "${PROJECT_NAME}" OUT_NAME "${OUT_NAME}")
+    set_target_properties(${MODULE_NAME}
+        PROPERTIES
+        OUTPUT_NAME ${OUT_NAME})
 endif()
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index bf7c84294..a64aa4d28 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -28,6 +28,8 @@ project(xfreerdp-client
 
 message("project ${PROJECT_NAME} is using version ${PROJECT_VERSION}")
 
+set(MODULE_NAME "xfreerdp")
+
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
@@ -95,8 +97,6 @@ set(PRIV_LIBS
 	${X11_LIBRARIES}
 )
 
-add_subdirectory(man)
-
 find_package(X11 REQUIRED)
 if(X11_XShm_FOUND)
 	add_definitions(-DWITH_XSHM)
@@ -221,6 +221,7 @@ if(WITH_CLIENT_INTERFACE)
 	install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
 endif()
 add_subdirectory(cli)
+add_subdirectory(man)
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "Client/X11")
 
diff --git a/client/X11/cli/CMakeLists.txt b/client/X11/cli/CMakeLists.txt
index 0761b2fa8..815328f4f 100644
--- a/client/X11/cli/CMakeLists.txt
+++ b/client/X11/cli/CMakeLists.txt
@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(MODULE_NAME "xfreerdp")
-set(MODULE_PREFIX "FREERDP_CLIENT_X11")
-
 set(SRCS
     xfreerdp.c
 )
diff --git a/client/X11/man/CMakeLists.txt b/client/X11/man/CMakeLists.txt
index 0478e6ea7..1ce94645d 100644
--- a/client/X11/man/CMakeLists.txt
+++ b/client/X11/man/CMakeLists.txt
@@ -5,4 +5,4 @@ set(DEPS
         xfreerdp-envvar.1.xml
     )
 
-generate_and_install_freerdp_man_from_xml(${PROJECT_NAME} "1" ${DEPS})
+generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" ${DEPS})
diff --git a/client/X11/man/xfreerdp-client.1.xml.in b/client/X11/man/xfreerdp.1.xml.in
similarity index 100%
rename from client/X11/man/xfreerdp-client.1.xml.in
rename to client/X11/man/xfreerdp.1.xml.in