diff --git a/orbmain/pom.xml b/orbmain/pom.xml
index 339e73a9e..bf91dd957 100644
--- a/orbmain/pom.xml
+++ b/orbmain/pom.xml
@@ -113,6 +113,7 @@
                             com.sun.corba.ee.impl.naming.*; version=1,
                             com.sun.corba.ee.impl.oa.*; version=1,
                             com.sun.corba.ee.impl.orb; version=1,
+                            com.sun.corba.ee.impl.util; version=1,
                             com.sun.corba.ee.impl.presentation.*; version=1,
                             com.sun.corba.ee.impl.txpoa; version=1,
                             com.sun.jndi.cosnaming; version=1
diff --git a/rmic/pom.xml b/rmic/pom.xml
index cf3fc5a04..40b2ceab0 100644
--- a/rmic/pom.xml
+++ b/rmic/pom.xml
@@ -20,6 +20,7 @@
 
     <artifactId>rmic</artifactId>
     <name>RMIC compiler</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -54,8 +55,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>4.2.1</version>
                 <configuration combine.self="override">
                     <archive>
                         <manifest>
@@ -66,6 +68,9 @@
                             <Implementation-Vendor>Eclipse Foundation</Implementation-Vendor>
                         </manifestEntries>
                     </archive>
+                    <instructions>
+                        <Export-Package>org.glassfish.rmic.*</Export-Package>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>