diff --git a/wireadmin/pom.xml b/wireadmin/pom.xml
index fda5b67..259f9dd 100644
--- a/wireadmin/pom.xml
+++ b/wireadmin/pom.xml
@@ -5,8 +5,8 @@
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>Apache Felix WireAdmin</name>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Wire Admin</name>
   <artifactId>org.apache.felix.wireadmin</artifactId>
   <dependencies>
     <dependency>
@@ -25,25 +25,22 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>WireAdmin</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
+          <instructions>
+            <Bundle-Name>WireAdmin</Bundle-Name>
+            <Bundle-Vendor>Apache Felix</Bundle-Vendor>
+            <Bundle-Description>
               Implementation of the WireAdmin Service.
-            </bundleDescription>
-            <bundleActivator>
+            </Bundle-Description>
+            <Bundle-Activator>
               org.apache.felix.wireadmin.Activator
-            </bundleActivator>
-            <bundleSymbolicName>org.apache.felix.wireadmin</bundleSymbolicName>
-            <importPackage>
-              org.osgi.framework, org.osgi.service.wireadmin; specification-version=1.0.0
-            </importPackage>
-          </osgiManifest>
+            </Bundle-Activator>
+            <Bundle-SymbolicName>org.apache.felix.wireadmin</Bundle-SymbolicName>
+            <Private-Package>org.apache.felix.wireadmin.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>