diff --git a/webconsole-plugins/ds/pom.xml b/webconsole-plugins/ds/pom.xml
index 0fe858b..b4155d0 100644
--- a/webconsole-plugins/ds/pom.xml
+++ b/webconsole-plugins/ds/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>2.1</version>
+        <version>3</version>
         <relativePath>../../../pom/pom.xml</relativePath>
     </parent>
 
@@ -33,6 +33,10 @@
         <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/ds</url>
     </scm>
 
+    <properties>
+        <felix.java.version>6</felix.java.version>
+    </properties>
+
     <build>
         <plugins>
             <!-- translate UTF-8 encoded properties files to ISO-8859-1 -->
@@ -55,7 +59,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.4</version>
+                <version>2.5.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -68,18 +72,14 @@
                         <Include-Resource>
                             {maven-resources},OSGI-INF=target/classes/OSGI-INF
                         </Include-Resource>
+                        <Import-Package>
+                             org.osgi.service.cm;version="[1.2,2)",
+                             org.osgi.service.metatype;version="[1.1,2)",
+                             *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -92,14 +92,14 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>5.0.0</version>
+            <artifactId>osgi.cmpn</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -121,11 +121,6 @@
             <version>20070829</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.8.3-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+
     </dependencies>
 </project>