diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml
index 766d2b5f..c9d4a2b4 100644
--- a/buildScripts/tests.ant.xml
+++ b/buildScripts/tests.ant.xml
@@ -148,10 +148,14 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 		<test.javacX version="17" />
 	</target>
 	
+	<target name="test.javac21" depends="test.compile, test.formatter.compile" description="runs the tests on your default VM, using javac21 as underlying compiler">
+		<test.javacX version="21" />
+	</target>
+	
 	<!-- For non-LTS versions, feel free to aggressively update these to the current non-LTS openjdk version, and delete them once they roll out of the 6 month window. -->
 	
-	<target name="test.javac20" depends="test.compile, test.formatter.compile" description="runs the tests on your default VM, using javac20 as underlying compiler">
-		<test.javacX version="20" />
+	<target name="test.javac23" depends="test.compile, test.formatter.compile" description="runs the tests on your default VM, using javac23 as underlying compiler">
+		<test.javacX version="23" />
 	</target>
 	
 	<target name="test.javacCurrent" depends="test.compile, test.formatter.compile" description="runs the tests on your default VM, using its javac as underlying compiler">
@@ -368,5 +372,5 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 	</target>
 	
 	<target name="test" depends="test.javacCurrent, test.eclipse-202212" description="runs the tests against the default JVM, javac, and eclipse" />
-	<target name="test.broad" depends="test.javac8, test.javac17, test.javac20, test.eclipse-oxygen, test.eclipse-202212, test.eclipse-202006-jdk8" description="runs the tests against the default JVM, javac, and eclipse" />
+	<target name="test.broad" depends="test.javac8, test.javac17, test.javac21, test.javac23, test.eclipse-oxygen, test.eclipse-202212, test.eclipse-202006-jdk8" description="runs the tests against the default JVM, javac, and eclipse" />
 </project>
diff --git a/doc/changelog.markdown b/doc/changelog.markdown
index 71c0a127..96894b96 100644
--- a/doc/changelog.markdown
+++ b/doc/changelog.markdown
@@ -2,10 +2,9 @@ Lombok Changelog
 ----------------
 
 ### v1.18.35 "Edgy Guinea Pig"
-* We recently released v1.18.34; there is no edge release since then.
+* PLATFORM: JDK23 support added.
 * BUGFIX: Eclipse projects using the `com.pro-crafting.tools:jasperreports-maven-plugin` will now compile.
 
-
 ### v1.18.34 (June 28th, 2024)
 * PLATFORM: Added support for Eclipse 2024-06; you'd get some `NoSuchMethodError` traces in your logs if using `@Builder` or `@Singular` prior to this fix. [Issue #3638](https://github.com/projectlombok/lombok/issues/3638).
 * IMPROBABLE BREAKING CHANGE: Lombok now adds `@lombok.Generated` by default to methods and types it generates. This may result in accidentally increasing your test coverage percentage. [Issue #3667](https://github.com/projectlombok/lombok/issues/3667).