--- a/make/Images.gmk	Fri Nov 27 16:29:22 2015 +0100
+++ b/make/Images.gmk	Fri Nov 20 13:02:06 2015 +0100
@@ -44,8 +44,8 @@
                jdk.vm.ci jdk.management
 
 # providers
-PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
-               jdk.naming.dns jdk.naming.rmi jdk.zipfs
+PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.jvmstat.rmi \
+               jdk.localedata jdk.naming.dns jdk.naming.rmi jdk.zipfs
 
 # tools
 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \

--- a/modules.xml	Fri Nov 27 16:29:22 2015 +0100
+++ b/modules.xml	Fri Nov 20 13:02:06 2015 +0100
@@ -1810,16 +1810,31 @@
   <module>
     <name>jdk.jvmstat</name>
     <depend>java.base</depend>
-    <depend>java.rmi</depend>
     <export>
       <name>sun.jvmstat.monitor</name>
       <to>jdk.attach</to>
       <to>jdk.jcmd</to>
       <to>jdk.jconsole</to>
+      <to>jdk.jvmstat.rmi</to>
     </export>
     <export>
       <name>sun.jvmstat.monitor.event</name>
       <to>jdk.jcmd</to>
+      <to>jdk.jvmstat.rmi</to>
+    </export>
+    <export>
+      <name>sun.jvmstat.perfdata.monitor</name>
+      <to>jdk.jvmstat.rmi</to>
+    </export>
+  </module>
+  <module>
+    <name>jdk.jvmstat.rmi</name>
+    <depend>java.base</depend>
+    <depend>java.rmi</depend>
+    <depend>jdk.jvmstat</depend>
+    <export>
+      <name>sun.jvmstat.monitor.remote</name>
+      <to>java.rmi</to>
     </export>
   </module>
   <module>