diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6cbd085c6fc41f6469e661f81e1c50d4a7e57471..618e8dd89ce68510b9b3e24418cf8a47a3cbd4ac 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,11 +1,13 @@
 Changelog
 =========
 
-0.3 (TBA)
----------
+0.2.1 (Jan 29, 2013)
+--------------------
+* Tags work again (Jonas Haag)
 * Apache/mod_wsgi deployment docs (Alex Marandon)
 * #43: ``bin/klaus``: ``--site-name`` did only accept ASCII strings
   (Alex Marandon, Martin Zimmermann, Jonas Haag)
+* More robust routing (Jonas Haag)
 
 0.2 (Dec 3, 2012)
 -----------------
diff --git a/LICENSE b/LICENSE
index e253b7988afdbac337d13227c779c3e160f964fd..3b1cd651988cc7c1b1245337d50a706c11aef9d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 https://github.com/jonashaag/klaus
-Copyright (c) 2011-2012 Jonas Haag <jonas@lophus.org> and contributors (see Git logs).
+Copyright (c) 2011-2013 Jonas Haag <jonas@lophus.org> and contributors (see Git logs).
 
 Feature contributions
 ---------------------
diff --git a/klaus/__init__.py b/klaus/__init__.py
index 707824a94d60b1efa4af987e213d007393bf7397..36a0d2cf4b420bf43914ad7c38b5677b9435e42f 100644
--- a/klaus/__init__.py
+++ b/klaus/__init__.py
@@ -6,7 +6,7 @@ from klaus import views, utils
 from klaus.repo import FancyRepo
 
 
-KLAUS_VERSION = utils.guess_git_revision() or '0.2'
+KLAUS_VERSION = utils.guess_git_revision() or '0.2.1'
 
 
 class Klaus(flask.Flask):
diff --git a/setup.py b/setup.py
index bd3183a358cd09b3005c11bb7960ac32bf17f132..bc23a085b753bb0c9bc3cbf6c7aa1ea0ddc1d014 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ except ImportError:
 
 setup(
     name='klaus',
-    version='0.2.0',
+    version='0.2.1',
     author='Jonas Haag',
     author_email='jonas@lophus.org',
     packages=['klaus'],