diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a80f775e89..3e9137d2cd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,20 +1,15 @@
-== Version 2.3.17 Work in progress (not released -- this is a draft) ==
+== Version 2.3.17 ==
 
   Users side :
   ------------
-     # An error 500 in the merge view, when one entity did not exist anymore, has been fixed.
+     # In the merge view :
+        - There were issues with ManyToMany fields.
+        - An error 500, when one entity did not exist anymore, has been fixed.
      # In the theme "Chantilly", an icon "Restore" was missing.
      # Apps :
         * Assistants :
             - The UserMessages not related to an entity were not viewable.
 
-  Developers side :
-  -----------------
-
-    Non breaking changes :
-    ----------------------
-        # Fix empty initial value of MergeField for ManyToMany fields.
-
 
 == Version 2.3.16 ==
 
diff --git a/creme/__init__.py b/creme/__init__.py
index d96c1fc1d9..e6b91adfb1 100644
--- a/creme/__init__.py
+++ b/creme/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '2.3.16'
+__version__ = '2.3.17'
 
 # App registry hooking ---------------------------------------------------------