diff --git a/setup.py b/setup.py
index 4d4073a..a30048b 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@
                'osm_openvim/scripts/get_dhcp_lease.sh']
 
 setup(name=__name,
-      version_command=('git describe', 'pep440-git'),
+      version_command=('git describe --tags --long --dirty --match v*', 'pep440-git-full'),
       description=__description,
       long_description=__description,
       author=__author,
diff --git a/setup_lite.py b/setup_lite.py
index 7bb1c79..a17ab7a 100755
--- a/setup_lite.py
+++ b/setup_lite.py
@@ -41,7 +41,7 @@
 __scripts__ = ['openflow-lib']
 
 setup(name=__name,
-      version_command=('git describe', 'pep440-git'),
+      version_command=('git describe --tags --long --dirty --match v*', 'pep440-git-full'),
       description=__description,
       long_description=__description,
       author=__author,