diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee1d41e296c5c493f7f1dbb20863225213429aab..585a13b2df2912d98fef3d0486cec48fefcb2ec8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.2 (Feb 14, 2018)
+-------------------
+- #202: Windows encoding problem (Jonas Haag)
+- #201: Improve diff rendering (Jonas Haag)
+
 1.2.1 (Jul 5, 2017)
 -------------------
 - SECURITY ISSUE, PLEASE UPDATE: Fix #200: Missing HTML escaping in diff view
diff --git a/klaus/__init__.py b/klaus/__init__.py
index 7745125fc4583c135206f342b5158db117ef021c..6a07e407bc00bba718cfbcf5090360af544a1d2b 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 '1.2.1'
+KLAUS_VERSION = utils.guess_git_revision() or '1.2.2'
 
 
 class Klaus(flask.Flask):
diff --git a/setup.py b/setup.py
index e6e1a7032391469b0e3eb914ebbaac63b02e6427..426e351ec8a9562f9b35949e28218e1e08005119 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ requires = ['six', 'flask', 'pygments', 'dulwich>=0.13.0', 'httpauth', 'humanize
 
 setup(
     name='klaus',
-    version='1.2.1',
+    version='1.2.2',
     author='Jonas Haag',
     author_email='jonas@lophus.org',
     packages=['klaus', 'klaus.contrib'],