diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..a71d60265f
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include *.xml
+include *.odt
+include *.csv
diff --git a/de_DE.csv b/de_DE.csv
index 90259cb4ae..e7cb7d876a 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -57,8 +57,8 @@ field,"stock.move,quantity",0,Quantity,Menge,0
 field,"stock.move,state",0,State,Status,0
 field,"stock.move,to_location",0,To Location,Zu Lagerort,0
 field,"stock.move,type",0,Type,Typ,0
-field,"stock.move,unit_digits",0,Unit Digits,Anzahl Einheiten,0
-field,"stock.move,unit_price",0,Unit Price,Preis pro Einheit,0
+field,"stock.move,unit_digits",0,Unit Digits,Anzahl Stellen,0
+field,"stock.move,unit_price",0,Unit Price,Einzelpreis,0
 field,"stock.move,uom",0,Uom,Einheit,0
 field,"stock.packing.in,code",0,Code,Code,0
 field,"stock.packing.in,contact_address",0,Contact Address,Kontaktadresse,0
@@ -100,8 +100,8 @@ help,"stock.product_stock_date.init,forecast_date",0,"Allow to compute expected
 ",0
 model,"ir.action,name",act_packing_out_form_assigned,Assigned Customer Packings,Zugewiesene Kundenverpackungen,0
 model,"ir.action,name",wizard_complete_inventory,Complete Inventory,Gesamter Lagerbestand,0
-model,"ir.action,name",act_packing_out_form,Customer Packing,Verpackung Kunde,0
-model,"ir.action,name",report_packing_out,Customer Packings,Kundenverpackungen,0
+model,"ir.action,name",report_packing_out,Customer Packing,Kundenverpackungen,0
+model,"ir.action,name",act_packing_out_form,Customer Packings,Verpackung Kunde,0
 model,"ir.action,name",act_packing_out_form_ready,Customer Packings Ready for Shipping,Versandbereite Kundenverpackungen,0
 model,"ir.action,name",act_packing_out_form_waiting,Customer Packings Waiting Assignation,Zuzuweisende Kundenverpackungen,0
 model,"ir.action,name",act_location_form,Edit Locations,Lagerorte bearbeiten,0
diff --git a/setup.py b/setup.py
index eb881ab14d..c2c913bee3 100644
--- a/setup.py
+++ b/setup.py
@@ -2,27 +2,22 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from distutils.core import setup
-from distutils.command import sdist
-
-
-class mysdist(sdist.sdist):
-
-    def add_defaults(self):
-        sdist.sdist.add_defaults(self)
-        if self.distribution.has_pure_modules():
-            build_py = self.get_finalized_command('build_py')
-            data = []
-            for package in build_py.packages:
-                src_dir = build_py.get_package_dir(package)
-                data.extend(build_py.find_data_files(package, src_dir))
-            self.filelist.extend(data)
+from setuptools import setup, find_packages
+import re
 
 info = eval(file('__tryton__.py').read())
 
-requires = ['trytond'] + ['trytond-' + x for x in info.get('depends', [])]
+requires = []
+for dep in info.get('depends', []):
+    match = re.compile(
+            '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+    if match:
+        dep = 'trytond' + match.group(2)
+    else:
+        dep = 'trytond_' + dep
+    requires.append(dep)
 
-setup(name='trytond-' + info['name'].lower(),
+setup(name='trytond_' + info['name'].lower(),
     version=info.get('version', '0'),
     description=info.get('description', ''),
     author=info.get('author', ''),
@@ -43,16 +38,15 @@ setup(name='trytond-' + info['name'].lower(),
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
+        'Intended Audience :: Manufacturing',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Topic :: Office/Business',
-        'Topic :: Office/Business :: Financial',
     ],
     license='GPL-3',
-    #requires=requires,
-    cmdclass={
-        'sdist': mysdist,
-    },
+    install_requires=requires,
 )