diff --git a/api/pom.xml b/api/pom.xml
index 6d4ea8e7..623c9771 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
-    Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -323,6 +323,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <release>9</release>
+                    <createMissingPackageInfoClass>false</createMissingPackageInfoClass>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                     </compilerArgs>
diff --git a/doc/release/CHANGES.txt b/doc/release/CHANGES.txt
index fb2bff09..e806d8ca 100644
--- a/doc/release/CHANGES.txt
+++ b/doc/release/CHANGES.txt
@@ -19,6 +19,10 @@ Bug IDs that start with "G" can be found in the GlassFish Issue Tracker
 Seven digit bug numbers are from the old Sun bug database, which is no
 longer available.
 
+		  CHANGES IN THE 2.1.2 RELEASE
+          ----------------------------
+E  660  jakarta.mail-api is not a Multi Release JAR
+
 		  CHANGES IN THE 2.1.1 RELEASE
 		  ----------------------------
 E  594	Implement equals() and hashcode() on jakarta.mail.Header