diff --git a/mosgi/mosgi.console.gui/pom.xml b/mosgi/mosgi.console.gui/pom.xml
index 6a69ce9..e27e791 100644
--- a/mosgi/mosgi.console.gui/pom.xml
+++ b/mosgi/mosgi.console.gui/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX Console Main GUI</name>
   <artifactId>org.apache.felix.mosgi.console.gui</artifactId>
   <groupId>org.apache.felix</groupId>
@@ -39,29 +39,17 @@
   <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 Console main GUI</bundleName>
-            <bundleDescription>MOSGi JMX Console main GUI</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>
-	    <importPackage>
-	      org.osgi.framework;specification-version="1.0.0",
-	      javax.swing;specification-version="1.0.0",
-	      javax.swing.event;specification-version="1.0.0",
-	      javax.swing.tree;specification-version="1.0.0",
-	      javax.management;specification-version="1.0.0",
-	      javax.management.remote;specification-version="1.0.0",
-	      org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-	    </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX Console main GUI</Bundle-Name>
+            <Bundle-Description>MOSGi JMX Console main GUI</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.console.gui.Activator</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>