diff --git a/compiler/pom.xml b/compiler/pom.xml
index 570084075..80cb5bb1f 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>compiler</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>compiler</name>
   <description>Implementation of mustache.js for Java</description>
@@ -88,6 +88,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <!--<Export-Package>*</Export-Package>
+            <Import-Package>*</Import-Package>-->
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
diff --git a/pom.xml b/pom.xml
index 69a39c88d..210bb6043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.7</version>
+          <version>2.5.0</version>
           <extensions>true</extensions>
           <executions>
             <execution>