Index: oak-mk/src/main/java/org/apache/jackrabbit/mk/api/package-info.java
===================================================================
--- oak-mk/src/main/java/org/apache/jackrabbit/mk/api/package-info.java	(revision 0)
+++ oak-mk/src/main/java/org/apache/jackrabbit/mk/api/package-info.java	(revision 0)
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@Version("0.1")
+@Export(optional = "provide:=true")
+package org.apache.jackrabbit.mk.api;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
+
Index: oak-mk/src/main/java/org/apache/jackrabbit/mk/json/package-info.java
===================================================================
--- oak-mk/src/main/java/org/apache/jackrabbit/mk/json/package-info.java	(revision 0)
+++ oak-mk/src/main/java/org/apache/jackrabbit/mk/json/package-info.java	(revision 0)
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@Version("0.1")
+@Export(optional = "provide:=true")
+package org.apache.jackrabbit.mk.json;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
+
Index: oak-mk/src/main/java/org/apache/jackrabbit/mk/util/package-info.java
===================================================================
--- oak-mk/src/main/java/org/apache/jackrabbit/mk/util/package-info.java	(revision 0)
+++ oak-mk/src/main/java/org/apache/jackrabbit/mk/util/package-info.java	(revision 0)
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@Version("0.1")
+@Export(optional = "provide:=true")
+package org.apache.jackrabbit.mk.util;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
+
Index: oak-mk/pom.xml
===================================================================
--- oak-mk/pom.xml	(revision 1329117)
+++ oak-mk/pom.xml	(working copy)
@@ -29,6 +29,25 @@
 
   <artifactId>oak-mk</artifactId>
   <name>Oak Microkernel</name>
+  <packaging>bundle</packaging>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.jackrabbit.mk.api,
+              org.apache.jackrabbit.mk.json,
+              org.apache.jackrabbit.mk.util
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <dependencies>
     <!-- Optional dependencies for different persistence backends -->
@@ -64,6 +83,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>
 
Index: oak-jcr/pom.xml
===================================================================
--- oak-jcr/pom.xml	(revision 1329117)
+++ oak-jcr/pom.xml	(working copy)
@@ -29,7 +29,24 @@
 
   <artifactId>oak-jcr</artifactId>
   <name>Oak JCR Binding</name>
+  <packaging>bundle</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              !
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>javax.jcr</groupId>
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/api/package-info.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/api/package-info.java	(revision 1329117)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/api/package-info.java	(working copy)
@@ -18,4 +18,10 @@
 /**
  * Oak repository API
  */
-package org.apache.jackrabbit.oak.api;
\ No newline at end of file
+@Version("0.1")
+@Export(optional = "provide:=true")
+package org.apache.jackrabbit.oak.api;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
+
Index: oak-core/pom.xml
===================================================================
--- oak-core/pom.xml	(revision 1329117)
+++ oak-core/pom.xml	(working copy)
@@ -29,7 +29,24 @@
 
   <artifactId>oak-core</artifactId>
   <name>Oak Core</name>
+  <packaging>bundle</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.jackrabbit.oak.api
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -102,5 +119,4 @@
         <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>
Index: oak-parent/pom.xml
===================================================================
--- oak-parent/pom.xml	(revision 1329117)
+++ oak-parent/pom.xml	(working copy)
@@ -72,6 +72,12 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.7</version>
+          <extensions>true</extensions>
+        </plugin>
+        <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <configuration>
             <skip>${skip.deployment}</skip>
@@ -90,6 +96,15 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  
+  <dependencies>
+    <dependency>
+      <groupId>biz.aQute</groupId>
+      <artifactId>bndlib</artifactId>
+      <version>1.50.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
   <profiles>
     <profile>