diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e436abd95..ac03e6d1af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,6 +49,9 @@ jobs:
           - kind: maven
             jre: 11
             os: windows-latest
+          - kind: maven
+            jre: 21
+            os: ubuntu-latest
           - kind: gradle
             jre: 17
             os: windows-latest
diff --git a/CHANGES.md b/CHANGES.md
index 93e693ebf5..9ba0a2ea2a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,10 +10,13 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Add Java 21 to CI ([#1822](https://github.com/diffplug/spotless/pull/1822))
 ### Fixed
 * Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
 ### Changes
 * Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
+* Bump palantir-java-format to 2.38.0 ([#1822](https://github.com/diffplug/spotless/pull/1822))
 
 ## [2.42.0] - 2023-09-28
 ### Added
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
index f769ad09ec..50bfdaed7e 100644
--- a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
+++ b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -30,7 +30,7 @@ private PalantirJavaFormatStep() {}
 	private static final String DEFAULT_STYLE = "PALANTIR";
 	private static final String NAME = "palantir-java-format";
 	private static final String MAVEN_COORDINATE = "com.palantir.javaformat:palantir-java-format:";
-	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.28.0");
+	private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "1.1.0").add(11, "2.38.0");
 
 	/** Creates a step which formats everything - code, import order, and unused imports. */
 	public static FormatterStep create(Provisioner provisioner) {