diff --git a/dbtemplates/__init__.py b/dbtemplates/__init__.py
index 818c5fb..e641bd5 100644
--- a/dbtemplates/__init__.py
+++ b/dbtemplates/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 5, 4)
+VERSION = (0, 5, 5)
 __version__ = '.'.join(map(str, VERSION))
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 47f6c9d..3a5072c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup, find_packages
 
 setup(
     name='django-dbtemplates',
@@ -8,13 +8,14 @@ setup(
     author='Jannis Leidel',
     author_email='jannis@leidel.info',
     url='http://github.com/jezdez/django-dbtemplates/wikis/',
-    download_url='http://github.com/jezdez/django-dbtemplates/zipball/0.5.4',
-    packages=[
-        'dbtemplates',
-        'dbtemplates.management',
-        'dbtemplates.management.commands'
-    ],
-    package_dir={'dbtemplates': 'dbtemplates'},
+    download_url='http://cloud.github.com/downloads/jezdez/django-dbtemplates/django-dbtemplates-0.5.5.tar.gz',
+    packages=find_packages(),
+    zip_safe=False,
+    package_data = {
+        'dbtemplates': [
+            'locale/*/LC_MESSAGES/*',
+        ],
+    },
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',