diff --git a/version.sh b/version.sh
index 2951cb2..36c62aa 100755
--- a/version.sh
+++ b/version.sh
@@ -5,9 +5,14 @@
 
 [ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`
 
-[ -z "${VERSION}" ] && VERSION=0.0.0
+[ -z "${VERSION}" ] && VERSION="0.0.0"
 
 [ "$1" = "major"  ] && printf ${VERSION%%.*} \
                     && exit 0
 
+BRANCH=`git rev-parse --abbrev-ref HEAD 2>/dev/null`
+
+[ -n "${BRANCH}" ] && [ "${BRANCH}" != "master" ] \
+                   && VERSION=${VERSION}-${BRANCH}
+
 printf ${VERSION} | tee VERSION