diff --git a/CHANGELOG b/CHANGELOG
index df00ba32ff6e75832a1f6eada618643f4391cd62..f1723ee7f4e00898a352da9ce3ac55920e7d06b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 
 Formerly known as 'gitlab-git-http-server'.
 
+v1.2.0
+
+- Add terminal websocket proxy endpoint
+- Rewrite all incoming multipart requests: write 'file' parts to tempfiles
+
 v1.1.1
 
 - Restrict effect of API rate limiting to /ci/api/v1/builds/register.json
diff --git a/VERSION b/VERSION
index 524cb55242b53f6a64cc646ea05db6acc7696d2d..26aaba0e86632e4d537006e45b0ec918d780b3b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.1
+1.2.0