diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1313103f1..d1bff6525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 
-## [2.4.0](https://github.com/inverse-inc/sogo/compare/SOGo-2.3.18...SOGo-2.4.0) (2021-03-31)
+## [2.4.1](https://github.com/inverse-inc/sogo/compare/SOGo-2.4.0...SOGo-2.4.1) (2021-06-01)
+
+### Bug Fixes
+
+* **addressbook(js):** handle multi-values organization field (c_o) ([69b86d3](https://github.com/inverse-inc/sogo/commit/69b86d3f9343de8364d19d5f301a3034cb4bccbd)), closes [#5312](https://www.sogo.nu/bugs/view.php?id=5312)
+* **mail:** avoid exception on recent GNUstep when no filename is defined ([a2ef542](https://github.com/inverse-inc/sogo/commit/a2ef542ad4251d32444aa3ad3930ccbd12e8ee65))
+* **saml:** don't ignore the signature of messages ([c0e6090](https://github.com/inverse-inc/sogo/commit/c0e60902a0cab4823323d1dd349666e7eb3781f3))
+* **saml:** fix profile initialization, improve error handling ([3d1b365](https://github.com/inverse-inc/sogo/commit/3d1b365b5d8802291270824fea176ac5e1838bf9)), closes [#5153](https://www.sogo.nu/bugs/view.php?id=5153) [#5270](https://www.sogo.nu/bugs/view.php?id=5270)
+
+## [2.4.0](https://github.com/inverse-inc/sogo/compare/SOGo-2.3.23...SOGo-2.4.0) (2021-03-31)
 
 ### Features
 
diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index bd32ee16b..edda031c3 100644
--- a/Documentation/docinfo.xml
+++ b/Documentation/docinfo.xml
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.4.0 - March 2021</releaseinfo>
-<subtitle>for version 2.4.0</subtitle>
-<date>2021-03-31</date>
+<releaseinfo>Version 2.4.1 - June 2021</releaseinfo>
+<subtitle>for version 2.4.1</subtitle>
+<date>2021-06-01</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc
index 2961b5d74..fd562542e 100644
--- a/Documentation/includes/global-attributes.asciidoc
+++ b/Documentation/includes/global-attributes.asciidoc
@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 2.4.0
+:release_version: 2.4.1
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/Version b/Version
index 77daeb1e5..c20f5557a 100644
--- a/Version
+++ b/Version
@@ -1,3 +1,3 @@
 MAJOR_VERSION=2
 MINOR_VERSION=4
-SUBMINOR_VERSION=0
\ No newline at end of file
+SUBMINOR_VERSION=1