diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0235f4192..f987bbb0f 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,15 @@ Redmine - project management software
 Copyright (C) 2006-2016  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2016-06-05 v3.1.6
+
+* Defect #22808: Malformed SQL query with SQLServer when grouping and sorting by fixed version
+* Defect #22924: Persistent XSS in Markdown parsing
+* Defect #22925: Persistent XSS in project homepage field
+* Defect #22926: Persistent XSS in Textile parsing
+* Patch #22759: pt-BR translation for 3.1.stable
+* Patch #22760: Korean translation for 3.1-stable
+
 == 2016-05-05 v3.1.5
 
 * Defect #22305: Highlighting of required and read-only custom fields broken in Workflow editor.
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 6eac73676..e801044d1 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
 
     # Branch values:
     # * official release: nil