diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d07388..4125788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ configure_file(
 
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/smart.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/smart"
+    "${CMAKE_CURRENT_BINARY_DIR}/smart.exe"
     IMMEDIATE @ONLY)
 
 #################################
@@ -65,24 +65,16 @@ target_link_libraries(check_login
 # Install Files
 ##############
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smart.conf
-        DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smart.conf DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/smart.exe DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC} RENAME smart)
 
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/smart
-        DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(PROGRAMS apply.pl DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(PROGRAMS readconfig.pl DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(PROGRAMS settings.pl DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(PROGRAMS static.pl DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
 
-install(PROGRAMS
-        apply.pl
-        readconfig.pl
-        settings.pl
-        static.pl
-        DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(DIRECTORY static/ DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC}/static)
 
-install(DIRECTORY static/
-        DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC}/static)
+install(TARGETS nwwebui DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
 
-install(TARGETS nwwebui
-        DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
-
-install(TARGETS check_login
-        DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})
+install(TARGETS check_login DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXEC})