diff --git a/CHANGES.txt b/CHANGES.txt
index 8ed275951e..eaa65a78ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+4.0.12
+Merged from 3.11:
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
+Merged from 3.0:
+
+
 4.0.11
  * Revert CASSANDRA-16718 (CASSANDRA-18560)
  * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
@@ -6,7 +12,6 @@
  * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
  * Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
 Merged from 3.11:
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
  * Fix CAST function for float to decimal (CASSANDRA-18647)
  * Suppress CVE-2022-45688 (CASSANDRA-18643)
  * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204)
diff --git a/build.xml b/build.xml
index f9ee2a782d..9828d5c7f7 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.11"/>
+    <property name="base.version" value="4.0.12"/>
     <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 932737c72b..e362598842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (4.0.12) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Stefan Miklosovic <smiklosovic@apache.org>  Tue, 18 Jul 2023 09:20:01 +0200
+
 cassandra (4.0.11) unstable; urgency=medium
 
   * New release