diff --git a/CHANGELOG b/CHANGELOG
index a9d76370..0ba88dba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,17 @@
 django-registration-redux changelog
 ===================================
 
+Version 2.2, TBD
+----------------
+
+Version 2.1, 17 December, 2018
+----------------
+* Bugfix: Fix formatting issues in documentation.
+`#319 <https://github.com/macropin/django-registration/pull/319>_`
+* Bugfix: Use ``get_username()`` instead of directly accessing the username to
+support subclasses of ``AbstractBaseUser``
+`#318 <https://github.com/macropin/django-registration/pull/318>_`
+
 Version 2.0, 05 December, 2017
 ----------------
 * BACKWARDS-INCOMPATIBLE CHANGE: Remove support for Django < 1.11.
diff --git a/docs/conf.py b/docs/conf.py
index acf89b1a..b85fc312 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -46,9 +46,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index a8730121..1ff313e5 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -19,6 +19,11 @@ older Django releases may work, but are officially unsupported. Additionally,
 
 Backwards-incompatible changes
 ------------------------------
+Version 2.1
+```````````
+
+- None
+
 Version 2.0
 ```````````
 
diff --git a/registration/__init__.py b/registration/__init__.py
index 0e8a7e88..24b21e06 100644
--- a/registration/__init__.py
+++ b/registration/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (2, 0, 0, 'final', 0)
+VERSION = (2, 1, 0, 'final', 0)
 
 
 def get_version():