diff --git a/setup.py b/setup.py
index b40df64fd..e4a8ff60b 100644
--- a/setup.py
+++ b/setup.py
@@ -51,9 +51,7 @@ class install_lib(_install_lib):
 
 
 class eo_sdist(sdist):
-
     def run(self):
-        print "creating VERSION file"
         if os.path.exists('VERSION'):
             os.remove('VERSION')
         version = get_version()
@@ -61,7 +59,6 @@ class eo_sdist(sdist):
         version_file.write(version)
         version_file.close()
         sdist.run(self)
-        print "removing VERSION file"
         if os.path.exists('VERSION'):
             os.remove('VERSION')
 
@@ -79,18 +76,32 @@ def data_tree(destdir, sourcedir):
     return r
 
 def get_version():
+    '''Use the VERSION, if absent generates a version with git describe, if not
+       tag exists, take 0.0- and add the length of the commit log.
+    '''
     if os.path.exists('VERSION'):
-        version_file = open('VERSION', 'r')
-        version = version_file.read()
-        version_file.close()
-        return version
+        with open('VERSION', 'r') as v:
+            return v.read()
     if os.path.exists('.git'):
-        p = subprocess.Popen(['git','describe','--match=v*'], stdout=subprocess.PIPE)
+        p = subprocess.Popen(
+            ['git', 'describe', '--dirty=.dirty', '--match=v*'],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
         result = p.communicate()[0]
-        version = result.split()[0][1:]
-        version = version.replace('-', '.')
-        return version
-    return '0'
+        if p.returncode == 0:
+            result = result.decode('ascii').strip()[1:]  # strip spaces/newlines and initial v
+            if '-' in result:  # not a tagged version
+                real_number, commit_count, commit_hash = result.split('-', 2)
+                version = '%s.post%s+%s' % (real_number, commit_count, commit_hash)
+            else:
+                version = result
+            return version
+        else:
+            return '0.0.post%s' % len(
+                    subprocess.check_output(
+                            ['git', 'rev-list', 'HEAD']).splitlines())
+    return '0.0'
+
 
 
 cmdclass = {