diff --git a/docs/index.rst b/docs/index.rst
index c63410a..ba6149b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,7 +1,7 @@
 Flask-ZODB
 ==========
 
-.. module:: flaskext.zodb
+.. module:: flask.ext.zodb
 
 An object database for your Flask application.
 
@@ -82,7 +82,7 @@ application for handling ZODB connections::
 
   app.config['ZODB_STORAGE'] = 'file://app.fs'
 
-  from flaskext.zodb import ZODB
+  from flask.ext.zodb import ZODB
   db = ZODB(app)
 
 The above uses a filestorage called :file:`app.fs`, located relative to the
@@ -155,7 +155,7 @@ with ZODB that handles this for you.
 
 ::
 
-  from flaskext.zodb import Object, List
+  from flask.ext.zodb import Object, List
 
   class User(Object):
 
diff --git a/examples/flaskr/flaskr.py b/examples/flaskr/flaskr.py
index d8c8228..53519f4 100644
--- a/examples/flaskr/flaskr.py
+++ b/examples/flaskr/flaskr.py
@@ -15,7 +15,7 @@
 from contextlib import closing
 from flask import Flask, request, session, g, redirect, url_for, abort, \
      render_template, flash
-from flaskext.zodb import ZODB, List
+from flask.ext.zodb import ZODB, List
 
 # configuration
 ZODB_STORAGE = 'file:///tmp/flaskr.fs'
diff --git a/flaskext/zodb.py b/flask_zodb.py
similarity index 100%
rename from flaskext/zodb.py
rename to flask_zodb.py
diff --git a/flaskext/__init__.py b/flaskext/__init__.py
deleted file mode 100644
index ece379c..0000000
--- a/flaskext/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
diff --git a/setup.py b/setup.py
index 8b29a7f..3f17c92 100644
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,7 @@ def add_entry():
     long_description=__doc__,
     keywords=['flask', 'zodb', 'persistence', 'database'],
 
-    packages=['flaskext'],
-    namespace_packages=['flaskext'],
+    py_modules=['flask_zodb'],
     zip_safe=False,
 
     requires=['flask (>=0.7)', 'ZODB', 'zodburi'],
diff --git a/tests.py b/tests.py
index e27fd0a..9664fd0 100644
--- a/tests.py
+++ b/tests.py
@@ -4,7 +4,7 @@
 import transaction
 
 from flask import Flask
-from flaskext.zodb import ZODB
+from flask_zodb import ZODB
 from ZODB.MappingStorage import MappingStorage