diff --git a/libraries/java-21/eea-generator.properties b/libraries/java-21/eea-generator.properties
new file mode 100644
index 000000000..05ccefef8
--- /dev/null
+++ b/libraries/java-21/eea-generator.properties
@@ -0,0 +1,4 @@
+packages.include=java,javax,org.w3c.dom,org.xml.sax
+
+; apply EEA annotations from java-17 project on -Deea-generator.action=generate
+input.dirs.extra=../java-17/src/main/resources
diff --git a/libraries/java-21/pom.xml b/libraries/java-21/pom.xml
new file mode 100644
index 000000000..73e2c9185
--- /dev/null
+++ b/libraries/java-21/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.lastnpe.eea</groupId>
+    <artifactId>eea-parent</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>java-21-eea</artifactId>
+  <name>EEA :: Java 21</name>
+
+  <!-- Do NOT use a <version> of the JAR for which this is an EEA here,
+       but version the EEA itself.  Put the version of the lib into
+       the EEA's name, if at all.-->
+
+  <properties>
+    <java.version>21</java.version>
+  </properties>
+
+</project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 57d264651..c26043aa1 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -24,6 +24,7 @@
 
   <modules>
     <module>java-17</module>
+    <module>java-21</module>
     <module>gson-2</module>
     <module>guava</module>
     <module>jakarta-mail-api-2</module>