diff --git a/build b/build
index a62c92d4..8dd23ef4 100755
--- a/build
+++ b/build
@@ -10,7 +10,7 @@ done
 echo "Downloading..."
 for CMD in `ls cmd/` ; do
   echo "Building: $CMD"
-  IMPRINT="-X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildName=$(sh contrib/semver/name.sh) -X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildVersion=$(sh contrib/semver/version.sh)"
+  IMPRINT="-X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildName=$(sh contrib/semver/name.sh) -X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildVersion=$(sh contrib/semver/version.sh --bare)"
   if [ $DEBUG ]; then
     go build -ldflags="$IMPRINT" -tags debug -v ./cmd/$CMD
   else
diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index 143bd906..480c4dda 100644
--- a/contrib/semver/version.sh
+++ b/contrib/semver/version.sh
@@ -12,6 +12,13 @@ MERGE=$(git rev-list $TAG..master --grep "from $DEVELOPBRANCH" 2>/dev/null | hea
 # Get the number of merges since the last merge to master
 PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" 2>/dev/null)
 
+# Decide whether we should prepend the version with "v" - the default is that
+# we do because we use it in git tags, but we might not always need it
+PREPEND="v"
+if [ "$1" == "--bare" ]; then
+  PREPEND=""
+fi
+
 # If it fails then there's no last tag - go from the first commit
 if [ $? != 0 ]; then
   PATCH=$(git rev-list HEAD --count 2>/dev/null)
@@ -22,7 +29,7 @@ if [ $? != 0 ]; then
     exit 1
   fi
 
-  printf 'v0.0.%d' "$PATCH"
+  printf '%s0.0.%d' "$PREPEND" "$PATCH"
   exit 1
 fi
 
@@ -39,12 +46,12 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
 # Output in the desired format
 if [ $PATCH = 0 ]; then
   if [ ! -z $FULL ]; then
-    printf 'v%d.%d.0' "$MAJOR" "$MINOR"
+    printf '%s%d.%d.0' "$PREPEND" "$MAJOR" "$MINOR"
   else
-    printf 'v%d.%d' "$MAJOR" "$MINOR"
+    printf '%s%d.%d' "$PREPEND" "$MAJOR" "$MINOR"
   fi
 else
-  printf 'v%d.%d.%d' "$MAJOR" "$MINOR" "$PATCH"
+  printf '%s%d.%d.%d' "$PREPEND" "$MAJOR" "$MINOR" "$PATCH"
 fi
 
 # Add the build tag on non-master branches