diff --git a/buildcore.sh b/buildcore.sh
index 0343d0376..e85ff7e67 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -173,8 +173,8 @@ fi
 
 function setversionvars {
     if [ ! -z "$USEGITVER" ]; then
-        VER=`git describe`
-        VER=${VER/-/.post}
+        VER=`git describe --tags`
+        VER=${VER/-/.POST}
         VER=${VER/-/.}
     else
         VER=`cat Version`
diff --git a/makegenesisbuilderrpm b/makegenesisbuilderrpm
index ae6d3d029..40a5f4407 100755
--- a/makegenesisbuilderrpm
+++ b/makegenesisbuilderrpm
@@ -1,6 +1,6 @@
 #!/bin/sh
-VER=`git describe`
-VER=${VER/-/.post}
+VER=`git describe --tags`
+VER=${VER/-/.POST}
 VER=${VER/-/.}
 rpmbuild --version > /dev/null
 if [ $? -gt 0 ]