diff --git a/mosgi/mosgi.managedelements.bundlesprobes/pom.xml b/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
index a7da0d3..9026dd6 100644
--- a/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
+++ b/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for OSGi bundles management</name>
   <artifactId>org.apache.felix.mosgi.managedelements.bundlesprobes</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -38,29 +38,16 @@
   <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 MBean for OSGi bundles management</bundleName>
-            <bundleDescription>MOSGi JMX MBean for OSGi bundles management</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>
-	      ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.framework;specification-version="1.0.0",
-              org.osgi.service.log;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX MBean for OSGi bundles management</Bundle-Name>
+            <Bundle-Description>MOSGi JMX MBean for OSGi bundles management</Bundle-Description>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.BundlesProbes</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>