diff --git a/mosgi/mosgi.jmx.rmiconnector/pom.xml b/mosgi/mosgi.jmx.rmiconnector/pom.xml
index 5f189e2..ca7451e 100644
--- a/mosgi/mosgi.jmx.rmiconnector/pom.xml
+++ b/mosgi/mosgi.jmx.rmiconnector/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX rmiconnector</name>
   <artifactId>org.apache.felix.mosgi.jmx.rmiconnector</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -43,35 +43,18 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX-MX4J RMI Connector</bundleName>
-            <bundleDescription>MOSGi JMX-MX4J RMI Connector</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi;specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.service.log;specification-version="1.0.0",
-              org.osgi.framework;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              javax.management.loading;specification-version="1.0.0",
-              javax.management.remote;specification-version="1.0.0",
-              javax.management.remote.rmi;specification-version="1.0.0",
-              javax.naming;specification-version="1.0.0",
-              javax.security.auth;specification-version="1.0.0"
-             </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX-MX4J RMI Connector</Bundle-Name>
+            <Bundle-Description>MOSGi JMX-MX4J RMI Connector</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.rmiconnector.RmiConnectorActivator</Bundle-Activator>
+            <Export-Package>org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi </Export-Package>
+	    <Private-Package>${pom.artifactId}.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>