diff --git a/mondrian/bnd.bnd b/mondrian/bnd.bnd
new file mode 100644
index 0000000000..deb29fa2e9
--- /dev/null
+++ b/mondrian/bnd.bnd
@@ -0,0 +1,5 @@
+Bundle-SymbolicName: pentaho.mondrian.core
+-privatepackage: \
+	mondrian.calc.impl,\
+	mondrian.xmla.impl
+Export-Package: mondrian.*
\ No newline at end of file
diff --git a/mondrian/pom.xml b/mondrian/pom.xml
index 50af525f08..0f48ae5acf 100644
--- a/mondrian/pom.xml
+++ b/mondrian/pom.xml
@@ -256,6 +256,28 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+       <groupId>biz.aQute.bnd</groupId>
+       <artifactId>bnd-maven-plugin</artifactId>
+       <version>6.1.0</version>
+         <executions>
+           <execution>
+             <id>bnd-process</id>
+             <goals>
+               <goal>bnd-process</goal>
+             </goals>
+           </execution>
+         </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+            <archive>
+                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+            </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xml-maven-plugin</artifactId>