diff --git a/CHANGELOG b/CHANGELOG
index 4d264e914dbd2ab0228565c04bae022028a27c74..8f6e0cee41469b1cb26912a1019c5aa80364ffca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 
 Formerly known as 'gitlab-git-http-server'.
 
+v0.8.4
+
+Fix Go 1.5 compatibility broken in 0.8.3. Update CI configuration so
+that tests run on Go 1.5, 1.6 and 1.7 (was only 1.6 before).
+
 v0.8.3
 
 Add rate-limiting feature for /api requests (disabled by default).
diff --git a/VERSION b/VERSION
index ee94dd834b5395f973d3c7992f661d306320aec2..b60d71966ae916fb42407607e33427d305ad69b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.3
+0.8.4