diff --git a/CHANGES.txt b/CHANGES.txt
index 75a312d637..eff3c638a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+4.0.5
+Merged from 3.11.13:
+Merged from 3.0:
+ * fsync TOC and digest files (CASSANDRA-10709)
+
+
 4.0.4
  * Optimise BTree build,update and transform operations (CASSANDRA-15510)
  * Clean up schema migration coordinator and tests (CASSANDRA-17533)
@@ -26,7 +32,6 @@ Merged from 3.11.13:
  * Validate existence of DCs when repairing (CASSANDRA-17407)
  * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415)
 Merged from 3.0:
- * fsync TOC and digest files (CASSANDRA-10709)
  * Fix URISyntaxException in nodetool with updated Java (CASSANDRA-17581)
  * Schema mutations may not be completed on drain (CASSANDRA-17524)
  * Fix data corruption in AbstractCompositeType due to static boolean byte buffers (CASSANDRA-14752)
diff --git a/build.xml b/build.xml
index 67cfc242ac..ee7bc3b689 100644
--- a/build.xml
+++ b/build.xml
@@ -33,7 +33,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="4.0.4"/>
+    <property name="base.version" value="4.0.5"/>
     <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index d6f69fd636..d4c033e691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-cassandra (4.0.4) UNRELEASED; urgency=medium
+cassandra (4.0.5) UNRELEASED; urgency=medium
 
   * New release
 
- -- Mick Semb Wever <mck@apache.org>  Sun, 13 Feb 2022 22:37:37 +0100
+ -- Mick Semb Wever <mck@apache.org>  Fri, 06 May 2022 18:38:33 +0200
+
+cassandra (4.0.4) unstable; urgency=medium
+
+  * New release
+
+ -- Mick Semb Wever <mck@apache.org>  Fri, 06 May 2022 18:38:33 +0200
 
 cassandra (4.0.3) unstable; urgency=medium