diff --git a/setup.py b/setup.py
index f993a44..3202aff 100644
--- a/setup.py
+++ b/setup.py
@@ -4,23 +4,36 @@ import os
 import subprocess
 
 from setuptools import setup, find_packages
-from distutils.command.sdist import sdist
+from setuptools.command.sdist import sdist
 
 
 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
     if os.path.exists('.git'):
-        p = subprocess.Popen(['git', 'describe', '--dirty', '--match=v*'], stdout=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:
-            version = str(result.split()[0][1:])
-            version = version.replace('-', '.')
+            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
-    return '0'
+        else:
+            return '0.0.post%s' % len(subprocess.check_output(['git', 'rev-list', 'HEAD']).splitlines())
+    return '0.0'
 
 
 class eo_sdist(sdist):
@@ -44,9 +57,21 @@ setup(
     author_email='info@entrouvert.com',
     packages=find_packages(os.path.dirname(__file__) or '.'),
     include_package_data=True,
+    url='https://git.entrouvert.org/passerelle-minint.git/',
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+    ],
     install_requires=[
         'suds-jurko'
     ],
+    zip_safe=False,
     cmdclass={
         'sdist': eo_sdist,
     }