diff --git a/eventadmin.bridge.upnp/pom.xml b/eventadmin.bridge.upnp/pom.xml
index 4c0f4d2..fb6742e 100644
--- a/eventadmin.bridge.upnp/pom.xml
+++ b/eventadmin.bridge.upnp/pom.xml
@@ -5,47 +5,46 @@
     <version>0.8.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix EventAdmin Bridge UPnP</name>
   <artifactId>org.apache.felix.eventadmin.bridge.upnp</artifactId>
+  <description>
+     This bundle provides a bridge between UPnP and EventAdmin events.
+  </description>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   <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>EventAdmin Bridge UPnP</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
-              This bundle provides a bridge between UPnP and EventAdmin events.
-            </bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <importService>
+          <instructions>
+            <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Import-Service>
             	org.osgi.service.event.EventAdmin,
        		org.osgi.service.event.EventHandler
-            </importService>
-            <exportService>
+            </Import-Service>
+            <Export-Service>
             	 org.osgi.service.upnp.UPnPEventListener
-            </exportService>
-          </osgiManifest>
+            </Export-Service>
+            <Private-Package>${pom.artifactId}.*</Private-Package>
+            <Include-Resource>
+		src/main/resources
+	    </Include-Resource>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>