diff --git a/MANIFEST.in b/MANIFEST.in
index f817c1f..6bfa2c3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include *.txt *.ini *.cfg *.rst
+exclude .git .gitignore
 recursive-include charm *.ico *.png *.css *.gif *.jpg *.txt
diff --git a/setup.py b/setup.py
index e1d4b88..7c208a6 100644
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,9 @@ setup(
     author_email='alex.kavanagh@canonical.com',
     license='Apache-2.0: http://www.apache.org/licenses/LICENSE-2.0',
     packages=find_packages(exclude=["unit_tests"]),
+    exclude_package_data={'': ['.gitignore', '.git']},
     zip_safe=False,
-    cmdclass = {'test': Tox},
+    cmdclass={'test': Tox},
     install_requires=install_require,
     extras_require={
         'testing': tests_require,