diff --git a/org.bridgedb/bnd.bnd b/org.bridgedb/bnd.bnd
new file mode 100644
index 000000000..1ee197a70
--- /dev/null
+++ b/org.bridgedb/bnd.bnd
@@ -0,0 +1,6 @@
+Export-Package: \
+	org.bridgedb.webservice,\
+	org.bridgedb.file,\
+	org.bridgedb.impl,\
+	buildsystem,\
+	org.bridgedb
\ No newline at end of file
diff --git a/org.bridgedb/pom.xml b/org.bridgedb/pom.xml
index 698d6217d..e82a363ab 100644
--- a/org.bridgedb/pom.xml
+++ b/org.bridgedb/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.bridgedb</groupId>
   <artifactId>org.bridgedb</artifactId>
   <name>BridgeDb</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -57,19 +57,26 @@
                 </testResources>
          <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.2</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <version>6.1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
-                    <instructions>
-                        <Bundle-Name>org.bridgedb</Bundle-Name>
-                        <Bundle-SymbolicName>org.bridgedb</Bundle-SymbolicName>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>buildsystem, org.bridgedb, org.bridgedb.file, org.bridgedb.impl, org.bridgedb.webservice</Export-Package>
-                        <Import-Package>javax.xml.parsers,org.xml.sax,org.xml.sax.helpers</Import-Package>
-                    </instructions>
-            </configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
 	</build>