diff --git a/upnp.sample.clock/pom.xml b/upnp.sample.clock/pom.xml
index c5e769f..87249b5 100644
--- a/upnp.sample.clock/pom.xml
+++ b/upnp.sample.clock/pom.xml
@@ -7,11 +7,11 @@
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <groupId>org.apache.felix</groupId>
   <name>Apache Felix UPnP Sample Clock</name>
   <artifactId>org.apache.felix.upnp.sample.clock</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
   <!-- <url>http://maven.apache.org</url> -->
   <dependencies>
     <dependency>
@@ -30,29 +30,26 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>UPnPClock</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
+          <instructions>
+            <Bundle-Name>${pom.name}</Bundle-Name>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Version>0.2.0</Bundle-Version>
+            <Bundle-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
+            <Bundle-Description>
                	CyberLink Clock clone to test UPnPBase driver
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.sample.clock</bundleSymbolicName>
-		<bundleActivator>org.apache.felix.upnp.sample.clock.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+            </Bundle-Description>
+            <Bundle-SymbolicName>org.apache.felix.upnp.sample.clock</Bundle-SymbolicName>
+            <Bundle-Activator>org.apache.felix.upnp.sample.clock.Activator</Bundle-Activator>
+            <Private-Package>org.apache.felix.upnp.sample.clock.*</Private-Package>
+            <Import-Package>*</Import-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources</directory>
-      </resource>
-    </resources>
   </build>
 </project>