diff --git a/MANIFEST.in b/MANIFEST.in
index 8af0aa9bc17..b9bf5f42764 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,5 +15,7 @@ include VERSION
 include MANIFEST.in
 include contrib/README.md
 include contrib/inventory *
+exclude lib/ansible/modules/core/.git*
+exclude lib/ansible/modules/extras/.git*
 prune lib/ansible/modules/core/.git
 prune lib/ansible/modules/extras/.git
diff --git a/setup.py b/setup.py
index 1f73836cbd3..38f00ba9e3b 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup(name='ansible',
       version=__version__,
       description='Radically simple IT automation',
       author=__author__,
-      author_email='michael@ansible.com',
+      author_email='support@ansible.com',
       url='http://ansible.com/',
       license='GPLv3',
       install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6', 'six'],