diff --git a/src/share/classes/sun/rmi/registry/RegistryImpl.java b/src/share/classes/sun/rmi/registry/RegistryImpl.java
index 465260da87b44bd2cade5cc38addc0ef0b2ddfbc..db18eb3364dab05f1920d98268198500816ac5fb 100644
--- a/src/share/classes/sun/rmi/registry/RegistryImpl.java
+++ b/src/share/classes/sun/rmi/registry/RegistryImpl.java
@@ -418,6 +418,8 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
          */
         perms.add(new SocketPermission("*", "connect,accept"));
 
+        perms.add(new RuntimePermission("accessClassInPackage.sun.*"));
+
         // add permissions required to load from codebase URL path
         LoaderHandler.addPermissionsForURLs(urls, perms, false);
 
diff --git a/test/sun/tools/jstatd/jstatdExternalRegistry.sh b/test/sun/tools/jstatd/jstatdExternalRegistry.sh
index ba960c26dd8d2667133d2106a9f4ffde67001ba7..55786096b40f034667c9ee9b9f09f6ce2f31ab21 100644
--- a/test/sun/tools/jstatd/jstatdExternalRegistry.sh
+++ b/test/sun/tools/jstatd/jstatdExternalRegistry.sh
@@ -22,7 +22,7 @@
 #
 
 # @test
-# @bug 4990825
+# @bug 4990825 7092186
 # @run shell/timeout=90 jstatdExternalRegistry.sh
 # @summary Test functionality of 'jstatd -p<port>&' with an external RMI registry