diff --git a/.build/build-rat.xml b/.build/build-rat.xml
index 6dd0890762..3926660ad6 100644
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@ -27,7 +27,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
diff --git a/.gitignore b/.gitignore
index 9d9d4dc50d..71dadaae89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.gitignore
# C*
+build
build/
src/gen-java/
src/resources/org/apache/cassandra/config/
diff --git a/CHANGES.txt b/CHANGES.txt
index 314734a50e..e159a26677 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
3.11.15
* Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
Merged from 3.0:
+ * Expand build.dir property in rat targets (CASSANDRA-18183)
* Suppress CVE-2022-41881 (CASSANDRA-18148)
* Default role is created with zero timestamp (CASSANDRA-12525)
* Suppress CVE-2021-37533 (CASSANDRA-18146)