diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..21b909d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include *py *.md *.txt *.ini .coveragerc
+recursive-include examples *.key *.db
+recursive-include docs *.py *.rst
diff --git a/setup.py b/setup.py
index 01c0b5f..892048d 100755
--- a/setup.py
+++ b/setup.py
@@ -6,14 +6,15 @@
 
 setup(
     name = 'custodia',
-    version = '0.0.1',
+    version = '0.1.0',
     license = 'GPLv3+',
     maintainer = 'Custodia project Contributors',
     maintainer_email = 'simo@redhat.com',
     url='https://github.com/simo5/custodia',
-    packages = ['custodia', 'custodia.httpd', 'custodia.store'],
+    packages = ['custodia', 'custodia.httpd', 'custodia.store',
+                'custodia.message', 'tests'],
     data_files = [('share/man/man7', ["man/custodia.7"]),
-                  ('share/doc/custodia', ['LICENSE', 'README']),
+                  ('share/doc/custodia', ['LICENSE', 'README', 'API.md']),
                   ('share/doc/custodia/examples', ['custodia.conf']),
                  ],
     scripts = ['custodia/custodia']
diff --git a/tests/custodia.py b/tests/custodia.py
index 84dc554..e14f091 100644
--- a/tests/custodia.py
+++ b/tests/custodia.py
@@ -4,7 +4,6 @@
 from tests.client import LocalConnection
 import json
 import os
-import signal
 import subprocess
 import time
 import unittest
diff --git a/tox.ini b/tox.ini
index 0e3dea0..e737ba2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,6 +50,7 @@ commands =
     sphinx-build -v -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [pytest]
+norecursedirs = build .tox
 python_files = tests/*.py custodia/*.py
 
 [flake8]