diff --git a/makegenesisbuilderrpm b/makegenesisbuilderrpm
index 12b3b312e..ae6d3d029 100755
--- a/makegenesisbuilderrpm
+++ b/makegenesisbuilderrpm
@@ -1,5 +1,7 @@
 #!/bin/sh
-VER=`cat Version`
+VER=`git describe`
+VER=${VER/-/.post}
+VER=${VER/-/.}
 rpmbuild --version > /dev/null
 if [ $? -gt 0 ]
 then
@@ -20,4 +22,4 @@ cp LICENSE.html $RPMROOT/BUILD
 cp xCAT-genesis-builder.spec $RPMROOT/SOURCES
 cd -
 rm -f $RPMROOT/SRPMS/xCAT-genesis-builder-$VER*rpm $RPMROOT/RPMS/*/xCAT-genesis-builder-$VER*rpm
-rpmbuild -ba xCAT-genesis-builder/xCAT-genesis-builder.spec
+rpmbuild -ba xCAT-genesis-builder/xCAT-genesis-builder.spec --define "version $VER" --define "release 1"
diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec
index cc888ed29..b64cc251c 100755
--- a/xCAT-genesis-builder/xCAT-genesis-base.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-base.spec
@@ -16,7 +16,6 @@ BuildArch: noarch
 %define __prelink_undo_cmd %{nil}
 # To fix the issue error: Arch dependent binaries in noarch package, the following line is needed on Fedora 23 ppc64
 %define _binaries_in_noarch_packages_terminate_build   0
-Release: snap%(date +"%Y%m%d%H%M")
 Epoch: 1
 AutoReq: false
 Prefix: /opt/xcat
@@ -25,7 +24,6 @@ AutoProv: false
 
 
 Name:	 %{name}
-Version: %{version}
 Group: System/Utilities
 License: Various (see individual packages for details)
 Vendor: IBM Corp.
diff --git a/xCAT-genesis-builder/xCAT-genesis-builder.spec b/xCAT-genesis-builder/xCAT-genesis-builder.spec
index d95b8afdc..b69f6bfdd 100644
--- a/xCAT-genesis-builder/xCAT-genesis-builder.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-builder.spec
@@ -11,7 +11,6 @@ AutoProv: false
 
 
 Name:	 %{name}
-Version: %{version}
 Group: System/Utilities
 License: EPL
 Vendor: IBM Corp.