diff --git a/CHANGELOG.md b/CHANGELOG.md
index 827b5728d..55902e0ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+1.2.11
+-----------
+Improvements
+- Milter enhancement for MailWatch (#1106)
+- Big update to Brazilian translation
+- Better count of Postfix processes
+- Upgrade pear/Mail_Mime to 1.10.2
+
+Fixes
+- Fix printing multiple mails on detail.php (#1100)
+- Truncate long Top Virus output (#1112)
+- Fix long queue id validation (#1105)
+- Redirect if login page session expired (#1111)
+- Fix printing multiple mails on detail.php (#1100)
+- Remove empty column on rep_total_mail_by_date.php (#1095, #1096)
+
 1.2.10
 -----------
 Compatibility
diff --git a/mailscanner/functions.php b/mailscanner/functions.php
index a8c5a248d..616a0dd9f 100644
--- a/mailscanner/functions.php
+++ b/mailscanner/functions.php
@@ -252,7 +252,7 @@ function getVirusRegex($scanner = null)
  */
 function mailwatch_version()
 {
-    return '1.2.10';
+    return '1.2.11';
 }
 
 /**