diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f1796bd5..f167dce2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,9 @@ project(obs-studio)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 include(ObsHelpers)
+include(ObsCpack)
+
+add_definitions(-DOBS_VERSION="${OBS_VERSION}")
 
 if(NOT _one_time_action_done)
 	if(MSVC)
@@ -72,74 +75,3 @@ else()
 endif()
 
 obs_install_additional()
-
-# CPack Configuration
-
-if(APPLE AND NOT CPACK_GENERATOR)
-	set(CPACK_GENERATOR "Bundle")
-elseif(WIN32 AND NOT CPACK_GENERATOR)
-	set(CPACK_GENERATOR "NSIS" "ZIP")
-endif()
-
-set(CPACK_PACKAGE_NAME "OBS Studio")
-set(CPACK_PACKAGE_VENDOR "obsproject.com")
-set(CPACK_PACKAGE_VERSION "0.0.1")
-set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OBS Studio - Multi-platform broadcasting software")
-
-if(INSTALLER_RUN)
-	file(TO_NATIVE_PATH "${OBS_EXECUTABLE32_DESTINATION}/obs" _obs32)
-	file(TO_NATIVE_PATH "${OBS_EXECUTABLE64_DESTINATION}/obs" _obs64)
-
-	#Workaround a cmake bug, remove when fixed
-	string(REPLACE "\\" "\\\\" _obs32 "${_obs32}")
-	string(REPLACE "\\" "\\\\" _obs64 "${_obs64}")
-
-	set(CPACK_PACKAGE_EXECUTABLES
-		"${_obs32}" "OBS Studio (32bit)"
-		"${_obs64}" "OBS Studio (64bit)")
-	set(CPACK_CREATE_DESKTOP_LINKS
-		"${_obs32}"
-		"${_obs64}")
-else()
-	file(TO_NATIVE_PATH "${OBS_EXECUTABLE_DESTINATION}/obs" _obs)
-
-	#Workaround a cmake bug, remove when fixed
-	string(REPLACE "\\" "\\\\" _obs "${_obs}")
-
-	set(CPACK_PACKAGE_EXECUTABLES "${_obs}" "OBS Studio")
-	set(CPACK_CREATE_DESKTOP_LINKS "${_obs}")
-endif()
-
-set(CPACK_BUNDLE_NAME "OBS Studio")
-set(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/cmake/osxbundle/Info.plist")
-set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/osxbundle/obs.icns")
-set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/cmake/osxbundle/obslaunch.sh")
-
-set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
-set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
-set(CPACK_NSIS_MODIFY_PATH ON)
-
-if(INSTALLER_RUN)
-	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio")
-	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
-	set(CPACK_PACKAGE_FILE_NAME "obs-studio")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	if(WIN32)
-		set(CPACK_PACKAGE_NAME "OBS Studio (64bit)")
-	endif()
-	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio64")
-	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
-	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x64")
-else()
-	if(WIN32)
-		set(CPACK_PACKAGE_NAME "OBS Studio (32bit)")
-	endif()
-	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio32")
-	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES32")
-	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x86")
-endif()
-
-include(CPack)
diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake
new file mode 100644
index 000000000..27375b682
--- /dev/null
+++ b/cmake/Modules/ObsCpack.cmake
@@ -0,0 +1,85 @@
+
+if(APPLE AND NOT CPACK_GENERATOR)
+	set(CPACK_GENERATOR "Bundle")
+elseif(WIN32 AND NOT CPACK_GENERATOR)
+	set(CPACK_GENERATOR "NSIS" "ZIP")
+endif()
+
+set(CPACK_PACKAGE_NAME "OBS Studio")
+set(CPACK_PACKAGE_VENDOR "obsproject.com")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OBS Studio - Multi-platform broadcasting software")
+
+set(CPACK_PACKAGE_VERSION_MAJOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+	execute_process(COMMAND git describe --always
+		OUTPUT_VARIABLE OBS_VERSION
+		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+	if(NOT "${OBS_VERSION}" STREQUAL "")
+		set(CPACK_PACKAGE_VERSION "${OBS_VERSION}")
+	endif()
+endif()
+
+set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
+
+if(INSTALLER_RUN)
+	file(TO_NATIVE_PATH "${OBS_EXECUTABLE32_DESTINATION}/obs" _obs32)
+	file(TO_NATIVE_PATH "${OBS_EXECUTABLE64_DESTINATION}/obs" _obs64)
+
+	#Workaround a cmake bug, remove when fixed
+	string(REPLACE "\\" "\\\\" _obs32 "${_obs32}")
+	string(REPLACE "\\" "\\\\" _obs64 "${_obs64}")
+
+	set(CPACK_PACKAGE_EXECUTABLES
+		"${_obs32}" "OBS Studio (32bit)"
+		"${_obs64}" "OBS Studio (64bit)")
+	set(CPACK_CREATE_DESKTOP_LINKS
+		"${_obs32}"
+		"${_obs64}")
+else()
+	file(TO_NATIVE_PATH "${OBS_EXECUTABLE_DESTINATION}/obs" _obs)
+
+	#Workaround a cmake bug, remove when fixed
+	string(REPLACE "\\" "\\\\" _obs "${_obs}")
+
+	set(CPACK_PACKAGE_EXECUTABLES "${_obs}" "OBS Studio")
+	set(CPACK_CREATE_DESKTOP_LINKS "${_obs}")
+endif()
+
+set(CPACK_BUNDLE_NAME "OBS Studio")
+set(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/cmake/osxbundle/Info.plist")
+set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/osxbundle/obs.icns")
+set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/cmake/osxbundle/obslaunch.sh")
+
+set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
+set(CPACK_NSIS_MODIFY_PATH ON)
+
+if(INSTALLER_RUN)
+	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio")
+	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
+	set(CPACK_PACKAGE_FILE_NAME "obs-studio-${OBS_VERSION}")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	if(WIN32)
+		set(CPACK_PACKAGE_NAME "OBS Studio (64bit)")
+	endif()
+	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio64")
+	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x64-${OBS_VERSION}")
+else()
+	if(WIN32)
+		set(CPACK_PACKAGE_NAME "OBS Studio (32bit)")
+	endif()
+	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OBSStudio32")
+	set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES32")
+	set(CPACK_PACKAGE_FILE_NAME "obs-studio-x86-${OBS_VERSION}")
+endif()
+
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
+
+include(CPack)