diff --git a/.gitignore b/.gitignore
index b27e051..7bd69b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-hbmqtt/__pycache__
+*.egg-info
 *.pyc
-
 .idea/hbmqtt.iml
+.tox/
+__pycache__
+build/
+dist/
+tests/plugins/test.db
diff --git a/MANIFEST.in b/MANIFEST.in
index 1640d6e..aef0ccb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,17 @@
-recursive-include scripts *.yaml
+include *.rst
+include *.txt
 include license.txt
+include samples/passwd
+include tests/plugins/passwd
+include tox.ini
+
+recursive-include docs *.css
+recursive-include docs *.html
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs Makefile
+recursive-include samples *.crt
+recursive-include samples *.py
+recursive-include scripts *.yaml
+recursive-include tests *.crt
+recursive-include tests *.py
diff --git a/tox.ini b/tox.ini
index 7a41479..132a8eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist =
     py344,
     py35,
     coverage,
-    #flake8
+    #flake8,
+    check-manifest
 
 [testenv]
 deps =
@@ -24,3 +25,6 @@ deps =
     coverage
     -rrequirements.txt
 
+[testenv:check-manifest]
+deps = check-manifest
+commands = check-manifest