diff --git a/CHANGES.txt b/CHANGES.txt
index 2c2d99f3a..3195ddbcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,10 +7,6 @@ http://issues.carrot2.org/secure/ReleaseNote.jspa?projectId=10070&version=12628
 HPPC-171: Drop esoteric JAR entirely (associative containers keyed using floating 
           point types).
 
-HPPC-170: removed OSGi metadata (bundle plugin) because it screws up class exclusion
-          in the esoteric-vs-main jar and I don't know/ use OSGi to know how to fix 
-          it.
-
 ** New features
 
    PR #6: Document that map's get() returns the empty value for non-existent 
diff --git a/hppc/pom.xml b/hppc/pom.xml
index be41e9dc4..a531746ef 100644
--- a/hppc/pom.xml
+++ b/hppc/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>hppc</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>HPPC Collections</name>
   <description>High Performance Primitive Collections. 
@@ -64,11 +64,30 @@
             <id>default-jar</id>
             <phase>package</phase>
             <configuration>
+              <archive>  
+                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+              </archive> 
             </configuration>
           </execution>
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${version.maven-bundle-plugin}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+                <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>com.carrotsearch</groupId>
         <artifactId>hppc-template-processor</artifactId>
diff --git a/pom.xml b/pom.xml
index 5c7da286c..9775fa2de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
     <version.koloboke>0.6.6</version.koloboke>
 
     <version.maven-assembly-plugin>3.1.0</version.maven-assembly-plugin>
+    <version.maven-bundle-plugin>3.5.0</version.maven-bundle-plugin>
     <version.maven-clean-plugin>3.1.0</version.maven-clean-plugin>
     <version.maven-compiler-plugin>3.7.0</version.maven-compiler-plugin>
     <version.maven-dependency-plugin>2.9</version.maven-dependency-plugin>