diff --git a/sbin/exabgp b/sbin/exabgp
index ec7f62c0a..5f64ddea4 100755
--- a/sbin/exabgp
+++ b/sbin/exabgp
@@ -10,10 +10,10 @@ if [ $? -eq  0 ]; then
     if [ $GIT_TAG -eq 0 ]; then
         GIT_BRANCH=`git branch | grep "*" | awk '{ print $2}'`
         GIT_COMMIT=`git rev-parse --short=10 HEAD`
-        export EXABGP_VERSION="main-${GIT_COMMIT}-$(date +%Y%m%d)"
+        export EXABGP_VERSION="$(date +%Y.%m.%d)-${GIT_BRANCH}-${GIT_COMMIT}"
     fi
 else
-    export EXABGP_VERSION="main-unknown-$(date +%Y%m%d)"
+    export EXABGP_VERSION="$(date -r $0 +%Y.%m.%d)-uncontrolled"
 fi