diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d6d7bcb..57a923c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,7 +195,7 @@ SET( CMAKE_CXX_FLAGS_DEBUG "-g -Wall")
 
 if (WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static -I./dependencies/include")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ -static -I../dependencies/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ -static -I./dependencies/include")
 endif (WIN32)
 
 
@@ -405,5 +405,5 @@ ENDIF( UNIX )
 SET(CPACK_GENERATOR "ZIP")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0-SVN")
+SET(CPACK_PACKAGE_VERSION_PATCH "0-Git:" ${COMMITHASH})
 INCLUDE(CPack)
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index ee030a2f..ef0eda7d 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -180,4 +180,4 @@ if(APPLE)
     SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 endif(APPLE)
     
-SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
+SET(WX_EXE_NAME visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX})