diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000000000000000000000000000000000..fd729875ed07c946bc3375caaf608a9ded0b079c
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include README.rst
+recursive-include docs *.py *.rst
+recursive-include replay *.sql3
diff --git a/setup.py b/setup.py
index c0619645a39c835ddc513d6550f7e4dd4b3440fd..f799789d3d348d97630643fa616cf782d92bc3d2 100644
--- a/setup.py
+++ b/setup.py
@@ -13,24 +13,14 @@ setup(
     version='master',
     description='Replay Attack Database Access API for Bob',
     url='http://github.com/bioidiap/bob.db.replay',
-    license='LICENSE.txt',
+    license='GPLv3',
     author_email='Andre Anjos <andre.anjos@idiap.ch>',
     #long_description=open('doc/howto.rst').read(),
 
     # This line is required for any distutils based packaging.
     packages=find_packages(),
-
-    # Always include your .sql3 file with the package data. This will make sure
-    # it is packaged correctly for PyPI uploads or for any other package
-    # management system such as Ubuntu's.
-    package_data = {
-      '': [
-        'README.rst',
-        ],
-      'replay': [
-        'db/db.sql3',
-        ],
-      },
+    include_package_data=True,
+    zip_safe=False,
 
     install_requires=[
         "bob == master",  # base signal proc./machine learning library