diff --git a/pom.xml b/pom.xml
index 77eb28d..066c8fe 100755
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.sshd</groupId>
-				<artifactId>sshd-core</artifactId>
+				<artifactId>sshd-osgi</artifactId>
 				<version>${version.sshd}</version>
 			</dependency>
 			<dependency>
@@ -197,6 +197,11 @@
 						<skipIfEmpty>true</skipIfEmpty>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>biz.aQute.bnd</groupId>
+					<artifactId>bnd-maven-plugin</artifactId>
+					<version>6.4.0</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
@@ -255,6 +260,19 @@
 					</toolchains>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<id>jar</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
diff --git a/sshsig-bcprov/pom.xml b/sshsig-bcprov/pom.xml
index e4e5c55..6028d0f 100644
--- a/sshsig-bcprov/pom.xml
+++ b/sshsig-bcprov/pom.xml
@@ -13,6 +13,7 @@
 	<name>SSHSIG :: Tests for org.bouncycastle:bcprov</name>
 
 	<properties>
+		<bnd.skip>true</bnd.skip>
 		<maven.source.skip>true</maven.source.skip>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<maven.install.skip>true</maven.install.skip>
diff --git a/sshsig-core/bnd.bnd b/sshsig-core/bnd.bnd
new file mode 100644
index 0000000..75c5d83
--- /dev/null
+++ b/sshsig-core/bnd.bnd
@@ -0,0 +1 @@
+Export-Package: de.profhenry.sshsig.core.*
\ No newline at end of file
diff --git a/sshsig-i2pcrypto/pom.xml b/sshsig-i2pcrypto/pom.xml
index 1c730c9..c49b7ae 100644
--- a/sshsig-i2pcrypto/pom.xml
+++ b/sshsig-i2pcrypto/pom.xml
@@ -13,6 +13,7 @@
 	<name>SSHSIG :: Tests for net.i2p.crypto:eddsa</name>
 
 	<properties>
+		<bnd.skip>true</bnd.skip>
 		<maven.source.skip>true</maven.source.skip>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<maven.install.skip>true</maven.install.skip>
diff --git a/sshsig-mina/bnd.bnd b/sshsig-mina/bnd.bnd
new file mode 100644
index 0000000..55077e6
--- /dev/null
+++ b/sshsig-mina/bnd.bnd
@@ -0,0 +1 @@
+Export-Package: de.profhenry.sshsig.mina.*
\ No newline at end of file
diff --git a/sshsig-mina/pom.xml b/sshsig-mina/pom.xml
index e0012c7..9e88da9 100644
--- a/sshsig-mina/pom.xml
+++ b/sshsig-mina/pom.xml
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.sshd</groupId>
-			<artifactId>sshd-core</artifactId>
+			<artifactId>sshd-osgi</artifactId>
 		</dependency>
 		<!-- TESTING =============================================================================================== -->
 		<dependency>