diff --git a/.gitignore b/.gitignore
index 4624f7dd2..e038b53ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,17 @@
+*.DS_Store
+*.egg*
 *.log
-*.log.*
+*.mo
 *.pyc
+*.swo
 *.swp
 *~
 .openstackclient-venv
+.tox
 .venv
 AUTHORS
 build
-dist
-python_openstackclient.egg-info
-.tox/
 ChangeLog
-TAGS
+dist
+doc/build
 openstackclient/versioninfo
diff --git a/MANIFEST.in b/MANIFEST.in
index 0856b5efb..a7f747b84 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,13 @@
 include AUTHORS
+include ChangeLog
 include LICENSE
-include README.rst
 include openstackclient/versioninfo
+include README.rst
+
 recursive-include doc *
 recursive-include tests *
+
+exclude .gitignore
+exclude .gitreview
+
+global-exclude *.pyc