diff --git a/.gitignore b/.gitignore
index 0dfcadfe..51d262ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build
 dist
 git_review.egg-info
+MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..8855e05a
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include README
+include LICENSE
+include AUTHORS
+graft doc
diff --git a/README.md b/README
similarity index 100%
rename from README.md
rename to README
diff --git a/setup.py b/setup.py
index e18c99d0..e37f6717 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from distutils.core import setup
+from setuptools import setup
 from distutils.command.build import build
+from setuptools.command.bdist_egg import bdist_egg
 from sphinx.setup_command import BuildDoc
 import commands
 
@@ -33,12 +34,21 @@ class local_build_sphinx(BuildDoc):
             BuildDoc.run(self)
 cmdclass['build_sphinx'] = local_build_sphinx
 
+
 class local_build(build):
     def run(self):
         build.run(self)
         commands.getoutput("sphinx-build -b man -c doc doc/ build/sphinx/man")
 cmdclass['build'] = local_build
 
+
+class local_bdist_egg(bdist_egg):
+    def run(self):
+        commands.getoutput("sphinx-build -b man -c doc doc/ build/sphinx/man")
+        bdist_egg.run(self)
+cmdclass['bdist_egg'] = local_bdist_egg
+
+
 setup(
     name='git-review',
     version=version,
@@ -50,6 +60,6 @@ setup(
     author_email='openstack@lists.launchpad.net',
     url='http://www.openstack.org',
     scripts=['git-review'],
-    data_files=[('share/man/man1',['build/sphinx/man/git-review.1'])],
+    data_files=[('share/man/man1', ['build/sphinx/man/git-review.1'])],
     cmdclass=cmdclass,
     )