diff --git a/lib/calculate-version.js b/lib/calculate-version.js
index 941e54208ee..790a912429f 100644
--- a/lib/calculate-version.js
+++ b/lib/calculate-version.js
@@ -9,7 +9,7 @@ module.exports = function() {
   if (existsSync(gitPath)) {
     var info = gitRepoInfo(gitPath);
     if (info.tag) {
-      return info.tag;
+      return info.tag.replace(/^v/, '');
     }
 
     return packageVersion + '+' + info.sha.slice(0, 10);
diff --git a/lib/version-replace.js b/lib/version-replace.js
index d3952f49fba..56eeb8f1574 100644
--- a/lib/version-replace.js
+++ b/lib/version-replace.js
@@ -1,5 +1,5 @@
 var calculateVersion = require('./calculate-version');
-var version = calculateVersion().replace(/^v/, '');
+var version = calculateVersion();
 var replace = require('broccoli-string-replace');
 
 module.exports = function configFiles(tree) {