diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac46bf4588fa8eee3da6a6eaa7c441c9bf26ee1f..8fc8c4e8e493a54d50993c30527580fb24a3b4f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,25 +34,14 @@ set(COMPANY "Mavlink")
 set(COPYRIGHT "Copyright (c) 2018 QGroundControl. All rights reserved.")
 set(IDENTIFIER "io.mavlink.qgroundcontrol")
 
-execute_process(
-	COMMAND git submodule update --init
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-	)
-
-execute_process(
-	COMMAND git describe --always --tags
-	OUTPUT_VARIABLE git_tag
-	OUTPUT_STRIP_TRAILING_WHITESPACE
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-	)
-
 add_definitions(
 	-DQGC_APPLICATION_NAME="QGroundControl"
 	-DQGC_ORG_NAME="QGroundControl.org"
 	-DQGC_ORG_DOMAIN="org.qgroundcontrol"
 	)
 
-message(STATUS "QGroundControl version: ${git_tag}")
+include(Git)
+message(STATUS "QGroundControl version: ${GIT_VERSION}")
 
 #=============================================================================
 # ccache
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e3d1a6a86ada30928a78c5705022d45a680ba81..0dff5582d76ec5eebe5eb3c9811bc2fad993ea08 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,7 +106,7 @@ add_library(qgc
 	TerrainTile.cc
 )
 
-set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
+set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${GIT_VERSION}")
 
 add_subdirectory(ui)