diff --git a/docs/index.rst b/docs/index.rst
index 8c9ea88..a2a33b3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -44,7 +44,7 @@ Registration
 Applications can be registered directly in the extension constructor::
 
     from flask import Flask
-    from flask.ext.mako import MakoTemplates
+    from flask_mako import MakoTemplates
 
     app = Flask(__name__)
     mako = MakoTemplates(app)
@@ -97,7 +97,7 @@ as Jinja2 templates. Additionally, Mako templates receive the same context as
 Jinja2 templates. This allows you to use the same variables as you normally
 would (``g``, ``session``, ``url_for``, etc)::
 
-    from flask.ext.mako import render_template
+    from flask_mako import render_template
 
     def hello_mako():
         return render_template('hello.html', name='mako')
diff --git a/flask_mako.py b/flask_mako.py
index 893b73c..d2d5b47 100644
--- a/flask_mako.py
+++ b/flask_mako.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.mako
+    flask_mako
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     Extension implementing Mako Templates support in Flask with support for
@@ -32,7 +32,7 @@
 
 itervalues = getattr(dict, 'itervalues', dict.values)
 
-_BABEL_IMPORTS =  'from flask.ext.babel import gettext as _, ngettext, ' \
+_BABEL_IMPORTS =  'from flask_babel import gettext as _, ngettext, ' \
                   'pgettext, npgettext'
 _FLASK_IMPORTS =  'from flask.helpers import url_for, get_flashed_messages'
 
diff --git a/flaskext/__init__.py b/flaskext/__init__.py
deleted file mode 100644
index b0d6433..0000000
--- a/flaskext/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
diff --git a/setup.py b/setup.py
index d6b701b..09b5f8c 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='Flask-Mako',
-    version='0.4',
+    version='0.5',
     url='https://github.com/benselme/flask-mako',
     license='BSD',
     author='Beranger Enselme, Frank Murphy',
diff --git a/tests/test_mako.py b/tests/test_mako.py
index 8b84f9c..c5fe093 100644
--- a/tests/test_mako.py
+++ b/tests/test_mako.py
@@ -10,8 +10,8 @@
 
 import flask
 from flask import Flask, Blueprint, g
-from flask.ext.mako import (MakoTemplates, TemplateError, render_template,
-                            render_template_string, render_template_def)
+from flask_mako import (MakoTemplates, TemplateError, render_template,
+                        render_template_string, render_template_def)
 
 from mako.exceptions import CompileException