diff --git a/setup.py b/setup.py
index 4afa103..dc5db15 100755
--- a/setup.py
+++ b/setup.py
@@ -17,15 +17,21 @@ def get_version():
         with open('VERSION', 'r') as v:
             return v.read()
     if os.path.exists('.git'):
-        p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
+        p = subprocess.Popen(['git','describe','--dirty=.dirty','--match=v*'],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         result = p.communicate()[0]
         if p.returncode == 0:
-            result = result.split()[0][1:]
+            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:
-            result = '0.0.0-%s' % len(subprocess.check_output(
-                ['git', 'rev-list', 'HEAD']).splitlines())
-        return result.replace('-', '.').replace('.g', '+g')
+            return '0.0.post%s' % len(
+                    subprocess.check_output(
+                            ['git', 'rev-list', 'HEAD']).splitlines())
     return '0.0.0'
 
 setup(