diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index b3d211b..6e3fbc6 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,5 +1,11 @@
 # django-watson changelog
 
+## 1.2.2 - 04/06/2015
+
+- Fixing `filter()` to work with text-based primary keys in postgres (Jeppe Vesterbæk).
+- Improvements to query escaping (@amureki).
+- Disabling prefetch-related optimization in built-in views to avoid buggy Django behavior (@etianen).
+
 
 ## 1.2.1 - 07/03/2015
 
diff --git a/setup.py b/setup.py
index 0844aaf..5677d82 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from distutils.core import setup
 
 setup(
     name = "django-watson",
-    version = "1.2.1",
+    version = "1.2.2",
     description = "Full-text multi-table search application for Django. Easy to install and use, with good performance.",
     long_description = open(os.path.join(os.path.dirname(__file__), "README.markdown")).read(),
     author = "Dave Hall",