diff --git a/CHANGES b/CHANGES
index 350d0aae..dc7aa7a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,20 +1,32 @@
 Changelog
 =========
 
-Here you can see the full list of changes between each Flask-SQLAlchemy
-release.
-
-Version 3.0
+Version 2.2
 -----------
 
-In development, codename Dubnium
+Released on February 27, 2017, codename Dubnium
 
+- Minimum SQLAlchemy version is 0.8 due to use of ``sqlalchemy.inspect``.
 - Added support for custom ``query_class`` and ``model_class`` as args
-  to the ``SQLAlchemy`` constructor.
-- Fix minimum SQLAlchemy version requirement (0.8 or above), due to use
-  of ``sqlalchemy.inspect``.
+  to the ``SQLAlchemy`` constructor. (`#328`_)
+- Allow listening to SQLAlchemy events on ``db.session``. (`#364`_)
+- Allow ``__bind_key__`` on abstract models. (`#373`_)
+- Allow ``SQLALCHEMY_ECHO`` to be a string. (`#409`_)
+- Warn when ``SQLALCHEMY_DATABASE_URI`` is not set. (`#443`_)
+- Don't let pagination generate invalid page numbers. (`#460`_)
 - Drop support of Flask < 0.10. This means the db session is always tied to
-  the app context and its teardown event.
+  the app context and its teardown event. (`#461`_)
+- Tablename generation logic no longer accesses class properties unless they
+  are ``declared_attr``. (`#467`_)
+
+.. _#328: https://github.com/mitsuhiko/flask-sqlalchemy/pull/328
+.. _#364: https://github.com/mitsuhiko/flask-sqlalchemy/pull/364
+.. _#373: https://github.com/mitsuhiko/flask-sqlalchemy/pull/373
+.. _#409: https://github.com/mitsuhiko/flask-sqlalchemy/pull/409
+.. _#443: https://github.com/mitsuhiko/flask-sqlalchemy/pull/443
+.. _#460: https://github.com/mitsuhiko/flask-sqlalchemy/pull/460
+.. _#461: https://github.com/mitsuhiko/flask-sqlalchemy/pull/461
+.. _#467: https://github.com/mitsuhiko/flask-sqlalchemy/pull/467
 
 Version 2.1
 -----------
diff --git a/MANIFEST.in b/MANIFEST.in
index 13cdd71e..08877bbd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
-include LICENSE CHANGES *.py
-recursive-include docs *
-recursive-exclude docs *.pyc
-recursive-exclude docs *.pyo
+include LICENSE CHANGES tox.ini test_sqlalchemy.py
+graft docs
 prune docs/_build
 prune docs/_themes/.git
+recursive-exclude docs *.pyc
+recursive-exclude docs *.pyo
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
index b534c193..4de8be1b 100644
--- a/flask_sqlalchemy/__init__.py
+++ b/flask_sqlalchemy/__init__.py
@@ -32,7 +32,7 @@
 
 from ._compat import iteritems, itervalues, string_types, xrange
 
-__version__ = '3.0-dev'
+__version__ = '2.2'
 
 # the best timer function for the platform
 if sys.platform == 'win32':
diff --git a/setup.cfg b/setup.cfg
index 5650c8f2..a74951ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ tag_build = .dev
 tag_date = 1
 
 [aliases]
-release = egg_info -RDb ''
+release = egg_info -Db ''
 
 [tool:pytest]
 norecursedirs = .* _* scripts {args}
diff --git a/setup.py b/setup.py
index 94dcd398..e3365d85 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='Flask-SQLAlchemy',
-    version='3.0',
+    version='2.2',
     url='http://github.com/mitsuhiko/flask-sqlalchemy',
     license='BSD',
     author='Armin Ronacher',