diff --git a/Makefile.am b/Makefile.am
index f1ca7b0a4..f36e81c8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,7 +287,15 @@ if ENABLE_DOCS
 JAVADOC_OPTS=-use -keywords -encoding UTF-8 -splitIndex \
  -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
 if HAVE_JAVA9
-JAVADOC_OPTS+=-source $(IT_LANGUAGE_SOURCE_VERSION) --ignore-source-errors
+JAVADOC_OPTS+=-source $(IT_LANGUAGE_SOURCE_VERSION)
+endif
+if HAVE_JAVA21
+JAVADOC_OPTS+=--add-exports=java.base/sun.security.provider=ALL-UNNAMED
+JAVADOC_OPTS+=--add-exports=java.base/sun.security.util=ALL-UNNAMED
+JAVADOC_OPTS+=--add-exports=java.base/sun.security.validator=ALL-UNNAMED
+JAVADOC_OPTS+=--add-exports=java.base/sun.security.x509=ALL-UNNAMED
+JAVADOC_OPTS+=--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED
+JAVADOC_OPTS+=--add-exports=java.desktop/sun.awt=ALL-UNNAMED
 endif
 if JAVADOC_SUPPORTS_J_OPTIONS
 JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m