diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57a923c0..99ad136d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,7 +403,8 @@ IF( UNIX )
 ENDIF( UNIX )
 
 SET(CPACK_GENERATOR "ZIP")
+set(CPACK_SOURCE_GENERATOR "TGZ")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0-Git:" ${COMMITHASH})
+SET(CPACK_PACKAGE_VERSION_PATCH "0-Git-" ${COMMITHASH})
 INCLUDE(CPack)
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index ef0eda7d..7a4f4e16 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -151,7 +151,7 @@ link_directories( ${CMAKE_BINARY_DIR} )
 SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns)
 
 ADD_EXECUTABLE (
-    wxvbam
+    visualboyadvance-m
     WIN32
     MACOSX_BUNDLE
     ${SRC_WX}
@@ -159,15 +159,16 @@ ADD_EXECUTABLE (
 )
 
 TARGET_LINK_LIBRARIES (
-    wxvbam
+    visualboyadvance-m
     ${VBAMCORE_LIBS}
     ${wxWidgets_LIBRARIES}
     ${FFMPEG_LIBRARIES}
     ${DIRECTX_LIBRARIES}
     ${CAIRO_LIBRARIES}
 )
-
-INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/wxvbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
+IF(NOT APPLE AND NOT UNIX)
+    INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
+ENDIF(NOT APPLE AND NOT UNIX)
 IF(NOT WIN32 AND NOT APPLE)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
 ENDIF(NOT WIN32 AND NOT APPLE)
diff --git a/src/wx/wxvbam.desktop b/src/wx/wxvbam.desktop
index 3b31ce6a..31d3e7f2 100644
--- a/src/wx/wxvbam.desktop
+++ b/src/wx/wxvbam.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=VBA-M
 GenericName=Game Boy Advance Emulator
 Comment=Nintendo Game Boy Advance Emulator
-Exec=wxvbam %f
+Exec=visualboyadvance-m %f
 Icon=vbam
 Categories=Game;Emulator;
 Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;