diff --git a/builddeb b/builddeb
index 758854b1..76972494 100755
--- a/builddeb
+++ b/builddeb
@@ -11,7 +11,10 @@ if grep wheezy /etc/os-release; then
     export DSCARGS=""
 fi
 # If not PBR, use the setup.py.tmpl
-$PYEXEC -c 'import pbr' || ./makesetup
+sed -e 's/~/./' ./makesetup > ./makesetup.deb
+chmod +x ./makesetup.deb
+./makesetup.deb
+#$PYEXEC -c 'import pbr' || ./makesetup
 VERSION=`$PYEXEC setup.py --version`
 $PYEXEC setup.py sdist
 py2dsc $DSCARGS dist/pyghmi-$VERSION.tar.gz
diff --git a/makesetup b/makesetup
index b229b116..3795e32f 100755
--- a/makesetup
+++ b/makesetup
@@ -3,7 +3,11 @@ cd `dirname $0`
 VERSION=`git describe|cut -d- -f 1`
 NUMCOMMITS=`git describe|cut -d- -f 2`
 if [ "$NUMCOMMITS" != "$VERSION"  ]; then
-    VERSION=$VERSION.dev$NUMCOMMITS+g`git describe|cut -d- -f 3`
+    LASTNUM=$(echo $VERSION|rev|cut -d . -f 1|rev)
+    LASTNUM=$((LASTNUM+1))
+    FIRSTPART=$(echo $VERSION|rev|cut -d . -f 2- |rev)
+    VERSION=${FIRSTPART}.${LASTNUM}
+    VERSION=$VERSION~dev$NUMCOMMITS+`git describe|cut -d- -f 3`
 fi
 echo $VERSION > VERSION
 sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py