diff --git a/cal10n-api/pom.xml b/cal10n-api/pom.xml
index 9c858fc..4ae35f8 100644
--- a/cal10n-api/pom.xml
+++ b/cal10n-api/pom.xml
@@ -11,7 +11,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>cal10n-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>Compiler assisted localization library (CAL10N) -    API</name>
 
   <dependencies>
@@ -20,24 +20,24 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.7</version>
+        <extensions>true</extensions>
         <configuration>
-          <archive>
-            <manifestEntries>
-              <Bundle-Version>${project.version}</Bundle-Version>
-              <Bundle-Description>${project.description}</Bundle-Description>
-              <Implementation-Version>${project.version}</Implementation-Version>
-            </manifestEntries>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
+          <instructions>
+            <_include>-target/classes/META-INF/${project.artifactId}.bnd</_include>
+          </instructions>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
             <id>bundle-test-jar</id>
             <phase>package</phase>
             <goals>
-              <goal>jar</goal>
               <goal>test-jar</goal>
             </goals>
           </execution>
diff --git a/cal10n-api/src/main/resources/META-INF/MANIFEST.MF b/cal10n-api/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 262f52c..0000000
--- a/cal10n-api/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Implementation-Title: cal10n-api
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: cal10n.api
-Bundle-Name: cal10n-api
-Bundle-Vendor: qos.ch
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: ch.qos.cal10n;version=${project.version}, ch.qos.cal10n.util;version=${project.version}
\ No newline at end of file
diff --git a/cal10n-api/src/main/resources/META-INF/cal10n-api.bnd b/cal10n-api/src/main/resources/META-INF/cal10n-api.bnd
new file mode 100644
index 0000000..c4ac58a
--- /dev/null
+++ b/cal10n-api/src/main/resources/META-INF/cal10n-api.bnd
@@ -0,0 +1,26 @@
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+# Retro-compatible with previous manifest (try defaults from bnd)
+Bundle-SymbolicName: cal10n.api
+Bundle-Name: cal10n-api
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
+# bnd exports all packages not matching *.impl and *.internal by default