diff --git a/.travis/deploy-linux.bash b/.travis/deploy-linux.bash
index 5b0628b845..bcc30d5468 100644
--- a/.travis/deploy-linux.bash
+++ b/.travis/deploy-linux.bash
@@ -31,11 +31,11 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
 	# Package it up and send it off
 	./squashfs-root/usr/bin/appimagetool /rpcs3/build/appdir
 	ls
-	COMM_TAG="$(git describe --tags $(git rev-list --tags --max-count=1))"
+	COMM_TAG="$(grep 'version{.*}' rpcs3/rpcs3_version.cpp | awk -F[{,] '{printf \"%d.%d.%d\", $2, $3, $4}')"
 	COMM_COUNT="$(git rev-list --count HEAD)"
 	curl -sLO https://github.com/hcorion/uploadtool/raw/master/upload.sh
 	
-	mv ./RPCS3*.AppImage rpcs3-${COMM_TAG}-${COMM_COUNT}-${TRAVIS_COMMIT:0:8}_linux64.AppImage
+	mv ./RPCS3*.AppImage rpcs3-v${COMM_TAG}-${COMM_COUNT}-${TRAVIS_COMMIT:0:8}_linux64.AppImage
 	
 	FILESIZE=($(stat -c %s ./rpcs3*.AppImage))
 	SHA256SUM=($(sha256sum ./rpcs3*.AppImage))
diff --git a/appveyor.yml b/appveyor.yml
index 56f800ab12..cfd162dfea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,16 +21,16 @@ cache:
 
 install:
 - ps: | # set env vars for versioning
-    $env:COMM_TAG = $(git describe --tags $(git rev-list --tags --max-count=1))
+    $env:COMM_TAG = $(Get-Content ./rpcs3/rpcs3_version.cpp | findstr 'version{.*}' | %{ $ver = $_ -split "[{,]"; "{0}.{1}.{2}" -f [int]$ver[1],[int]$ver[2],[int]$ver[3]; })
     $env:COMM_COUNT = $(git rev-list --count HEAD)
     $env:COMM_HASH = $(git rev-parse --short=8 HEAD)
 
     if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
-        $env:BUILD = "rpcs3-{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH
+        $env:BUILD = "rpcs3-v{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH
         $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_HASH
     }
     else {
-        $env:BUILD = "rpcs3-{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH
+        $env:BUILD = "rpcs3-v{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH
         $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_COUNT
     }
 
diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake
index 3a7ccaef12..11ac2eef43 100644
--- a/rpcs3/git-version.cmake
+++ b/rpcs3/git-version.cmake
@@ -1,6 +1,5 @@
 set(RPCS3_GIT_VERSION "unknown")
 set(RPCS3_GIT_BRANCH "unknown")
-set(RPCS3_GIT_TAG "unknown")
 
 find_package(Git)
 if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
@@ -33,17 +32,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
 	else()
 		string(STRIP ${RPCS3_GIT_BRANCH} RPCS3_GIT_BRANCH)
 	endif()
-	execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		RESULT_VARIABLE exit_code
-		OUTPUT_VARIABLE RPCS3_GIT_TAG)
-	if(NOT ${exit_code} EQUAL 0)
-		message(WARNING "git describe failed, unable to include git tag.")
-	else()
-		string(STRIP ${RPCS3_GIT_TAG} RPCS3_GIT_TAG)
-		string(REPLACE "v" "" RPCS3_GIT_TAG ${RPCS3_GIT_TAG})
-	endif()	
-	
+
 else()
 	message(WARNING "git not found, unable to include version.")
 endif()
@@ -54,7 +43,6 @@ function(gen_git_version rpcs3_src_dir)
 
 	message(STATUS "RPCS3_GIT_VERSION: " ${RPCS3_GIT_VERSION})
 	message(STATUS "RPCS3_GIT_BRANCH: " ${RPCS3_GIT_BRANCH})
-	message(STATUS "RPCS3_GIT_TAG: " ${RPCS3_GIT_TAG})
 
 	if(EXISTS ${GIT_VERSION_FILE})
 		# Don't update if marked not to update.
@@ -74,8 +62,7 @@ function(gen_git_version rpcs3_src_dir)
 
 	set(code_string "// This is a generated file.\n\n"
 		"#define RPCS3_GIT_VERSION \"${RPCS3_GIT_VERSION}\"\n"
-		"#define RPCS3_GIT_BRANCH \"${RPCS3_GIT_BRANCH}\"\n"
-		"#define RPCS3_GIT_TAG \"${RPCS3_GIT_TAG}\"\n\n"
+		"#define RPCS3_GIT_BRANCH \"${RPCS3_GIT_BRANCH}\"\n\n"
 		"// If you don't want this file to update/recompile, change to 1.\n"
 		"#define RPCS3_GIT_VERSION_NO_UPDATE 0\n")
 
diff --git a/rpcs3/rpcs3_version.cpp b/rpcs3/rpcs3_version.cpp
index c38de4baa5..045cd4b304 100644
--- a/rpcs3/rpcs3_version.cpp
+++ b/rpcs3/rpcs3_version.cpp
@@ -9,6 +9,7 @@ namespace rpcs3
 		return RPCS3_GIT_BRANCH;
 	}
 
-	//TODO: Make this accessible from cmake and keep in sync with MACOSX_BUNDLE_BUNDLE_VERSION.
+	// TODO: Make this accessible from cmake and keep in sync with MACOSX_BUNDLE_BUNDLE_VERSION.
+	// Currently accessible by Windows and Linux build scripts, see implementations when doing MACOSX
 	const extern utils::version version{ 0, 0, 7, utils::version_type::alpha, 1, RPCS3_GIT_VERSION };
 }