diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..28f7157e7
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include README.rst
+include ez_setup.py
+include epydoc-config
+recursive-include examples *.py
+recursive-include tools *.py README.rst validate
diff --git a/setup.py b/setup.py
index 106c239d1..671e3e773 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
-from ez_setup import use_setuptools
-use_setuptools()
-from setuptools import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from ez_setup import use_setuptools
+    use_setuptools()
+    from setuptools import setup
 from distutils.core import Extension
 
 f = open("README.rst")
@@ -15,7 +18,7 @@ finally:
 
 setup(
     name="pymongo",
-    version="0.5pre",
+    version="0.5.1pre",
     description="Driver for the Mongo database <http://www.mongodb.org>",
     long_description=readme_content,
     author="10gen",