diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index be3f426..6d2ea27 100644
--- a/org.osgi.core/pom.xml
+++ b/org.osgi.core/pom.xml
@@ -24,28 +24,25 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <name>OSGi R4 Core Bundle</name>
+  <description>OSGi Service Platform Release 4 Core Interfaces and Classes.</description>
   <artifactId>org.osgi.core</artifactId>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <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>osgi.core</bundleName>
-            <bundleVendor>OSGi Alliance</bundleVendor>
-            <bundleVersion>4</bundleVersion>
-            <bundleSymbolicName>osgi.core</bundleSymbolicName>
-            <bundleDescription>OSGi Service Platform Release 4 Core Interfaces and Classes.</bundleDescription>
-            <bundleCopyright>Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.</bundleCopyright>
-            <bundleCategory>osgi</bundleCategory>
-            <bundleDocUrl>http://www.osgi.org/</bundleDocUrl>
-            <exportPackage>org.osgi.framework; specification-version="1.3", org.osgi.service.condpermadmin; specification-version="1.0", org.osgi.service.packageadmin; specification-version="1.2", org.osgi.service.permissionadmin; specification-version="1.2", org.osgi.service.startlevel; specification-version="1.0", org.osgi.service.url; specification-version="1.0"</exportPackage>
-            <!--<dynamicImportPackage>*</dynamicImportPackage>-->
-          </osgiManifest>
+          <instructions>
+            <Export-Package>org.osgi.framework, org.osgi.service.condpermadmin, org.osgi.service.packageadmin, org.osgi.service.permissionadmin, org.osgi.service.startlevel, org.osgi.service.url</Export-Package>
+            <Import-Package>!org.osgi.*,*</Import-Package>
+            <Bundle-Version>4</Bundle-Version>
+            <Bundle-Vendor>OSGi Alliance</Bundle-Vendor>
+            <Bundle-Copyright>Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.</Bundle-Copyright>
+            <Bundle-Category>osgi</Bundle-Category>
+            <Bundle-DocUrl>http://www.osgi.org/</Bundle-DocUrl>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>