diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 005a2fb6dc7..cf74d80d068 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -334,6 +334,9 @@
         jdk.crypto.cryptoki,
         jdk.naming.dns;
     exports sun.security.pkcs to
+/*[IF OPENJCEPLUS_SUPPORT]*/
+        openjceplus,
+/*[ENDIF] OPENJCEPLUS_SUPPORT */
         jdk.crypto.ec,
         jdk.jartool;
     exports sun.security.provider to
@@ -372,6 +375,9 @@
     exports sun.security.util.math.intpoly to
         jdk.crypto.ec;
     exports sun.security.x509 to
+/*[IF OPENJCEPLUS_SUPPORT]*/
+        openjceplus,
+/*[ENDIF] OPENJCEPLUS_SUPPORT */
         jdk.crypto.ec,
         jdk.crypto.cryptoki,
         jdk.jartool;