diff --git a/NEWS b/NEWS
index cf2c4c7..ec71eba 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * Removed test dependency on sqlite, using nose instead.
 * Marked known-broken tests using nose's mechanism (most of these are not broken but are simply run in the incorrect context, such as threading-related tests that are incompatible with the libevent hub).
 * Remove copied code from python standard libs (in tests).
+* Added eventlet.patcher which can be used to import "greened" modules.
 
 0.8.16
 ======
diff --git a/doc/conf.py b/doc/conf.py
index 1c18124..a2fb194 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,10 +48,11 @@ copyright = u'2009, Eventlet Contributors'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+import eventlet
 # The short X.Y version.
-version = '0.9'
+version = '%s.%s' % (eventlet.version_info[0], eventlet.version_info[1])
 # The full version, including alpha/beta/rc tags.
-release = '0.9pre'
+release = eventlet.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/real_index.html b/doc/real_index.html
index 183b4a0..cf0e610 100644
--- a/doc/real_index.html
+++ b/doc/real_index.html
@@ -35,7 +35,7 @@ easy_install eventlet
 
 <p>Alternately, you can download the source tarball:
 <ul>
-<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.8.12.tar.gz#md5=f9888a6b4135a2c124200d233f5f5829">eventlet-0.8.12.tar.gz</a></li>
+<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.9.0.tar.gz#md5=4e14ce5070edd078e3a4e8d6df9a5dc4">eventlet-0.9.0.tar.gz</a></li>
 </ul>
 </p>
 
@@ -102,4 +102,4 @@ easy_install eventlet
       </ul>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/doc/testing.rst b/doc/testing.rst
index 3ed0f36..40127c1 100644
--- a/doc/testing.rst
+++ b/doc/testing.rst
@@ -23,6 +23,16 @@ That's it!  The output from running nose is the same as unittest's output, if th
 
 Many tests are skipped based on environmental factors; for example, it makes no sense to test Twisted-specific functionality when Twisted is not installed.  These are printed as S's during execution, and in the summary printed after the tests run it will tell you how many were skipped.
 
+Doctests
+--------
+
+To run the doctests included in many of the eventlet modules, use this command:
+
+.. code-block :: sh
+
+  $ nosetests --with-doctest eventlet/*.py
+  
+Currently there are 14 doctests.
 
 Standard Library Tests
 ----------------------
diff --git a/eventlet/__init__.py b/eventlet/__init__.py
index c062276..fb27b1c 100644
--- a/eventlet/__init__.py
+++ b/eventlet/__init__.py
@@ -1,2 +1,2 @@
-version_info = (0, 9, '0pre')
+version_info = (0, 9, 0)
 __version__ = '%s.%s.%s' % version_info
diff --git a/tests/greenio_test.py b/tests/greenio_test.py
index e4c9e2b..c20ae3a 100644
--- a/tests/greenio_test.py
+++ b/tests/greenio_test.py
@@ -126,7 +126,7 @@ class TestGreenIo(LimitedTestCase):
         client.close()
      
     def test_sendall(self):
-        # test adapted from Brian Brunswick's email
+        # test adapted from Marcus Cavanaugh's email
         # it may legitimately take a while, but will eventually complete
         self.timer.cancel()
         second_bytes = 10
diff --git a/tests/test__doctests.py b/tests/test__doctests.py
deleted file mode 100644
index da1102c..0000000
--- a/tests/test__doctests.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import os
-import re
-import doctest
-import unittest
-import eventlet
-
-base = os.path.dirname(eventlet.__file__)
-modules = set()
-
-for path, dirs, files in os.walk(base):
-    package = 'eventlet' + path.replace(base, '').replace('/', '.')
-    modules.add((package, os.path.join(path, '__init__.py')))
-    for f in files:
-        module = None
-        if f.endswith('.py'):
-            module = f[:-3]
-        if module:
-            modules.add((package + '.' + module, os.path.join(path, f)))
-
-suite = unittest.TestSuite()
-tests_count = 0
-modules_count = 0
-for m, path in modules:
-    if re.search('^\s*>>> ', open(path).read(), re.M):
-        s = doctest.DocTestSuite(m)
-        print '%s (from %s): %s tests' % (m, path, len(s._tests))
-        suite.addTest(s)
-        modules_count += 1
-        tests_count += len(s._tests)
-print 'Total: %s tests in %s modules' % (tests_count, modules_count)
-runner = unittest.TextTestRunner(verbosity=2)
-runner.run(suite)