diff --git a/integration/pom.xml b/integration/pom.xml
index 32d5104e1..dcf4bedcd 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -22,6 +22,7 @@
     <!-- 1.9.1 does not work. Do not update lightly -->
     <ant-junit.version>1.9.0</ant-junit.version>
     <antrun-plugin.version>1.8</antrun-plugin.version>
+    <bnd.skip>true</bnd.skip>
   </properties>
 
 
diff --git a/integration/src/main/resources/META-INF/MANIFEST.MF b/integration/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29bb..000000000
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 2dfc300e3..b5dc62ca3 100755
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -39,5 +39,19 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
 
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            -exportcontents: org.apache.commons.logging.*;version=${jcl.version}
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
 </project>
diff --git a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index aa79492a3..000000000
--- a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Implementation-Title: jcl-over-slf4j
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: jcl.over.slf4j
-Bundle-Name: jcl-over-slf4j
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.apache.commons.logging;version=1.2, 
-  org.apache.commons.logging.impl;version=1.2
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 850827072..1dc1d823e 100755
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -31,4 +31,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Automatic-Module-Name: ${bsn}
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
 </project>
diff --git a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index adecc065b..000000000
--- a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: jul.to.slf4j
-Bundle-Name: jul-to-slf4j
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.bridge;version=${parsedVersion.osgiVersion};uses:="org.slf4j,org.slf4j.spi"
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},org.slf4j.spi;version=${parsedVersion.osgiVersion}
-Automatic-Module-Name: jul.to.slf4j
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index e6438deb4..e6a90ec08 100755
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -41,4 +41,21 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Import-Package: org.slf4j.*;version="${range;[===,3);${slf4j.api.minimum.compatible.version}}"
+            Export-Package: org.apache.log4j.*;version=${reload4j.version}
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
 </project>
diff --git a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index 7a621dc65..000000000
--- a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Implementation-Title: log4j-over-slf4j
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: log4j.over.slf4j
-Bundle-Name: log4j-over-slf4j
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.apache.log4j;version=${reload4j.version},
- org.apache.log4j.helpers;version=${reload4j.version},
- org.apache.log4j.spi;version=${reload4j.version},
- org.apache.log4j.xml;version=${reload4j.version}
-Import-Package: org.slf4j;version=${slf4j.api.minimum.compatible.version},
- org.slf4j.helpers;version=${slf4j.api.minimum.compatible.version},
- org.slf4j.spi;version=${slf4j.api.minimum.compatible.version}
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index 0a78e1b31..ada037466 100755
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -37,8 +37,29 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Bundle-SymbolicName: org.slf4j.osgi-over-slf4j
+            Import-Package: org.slf4j.*, *
+            -exportcontents:
+            Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator
+            Bundle-Category: osgi
+            Automatic-Module-Name: ${bsn}
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
 </project>
diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 5fa377518..000000000
--- a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Implementation-Title: osgi-over-slf4j
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.slf4j.osgi-over-slf4j
-Bundle-Name: OSGi LogService implemented over SLF4J
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator
-Bundle-Category: osgi
-Import-Package: org.osgi.framework;version="[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion}
diff --git a/pom.xml b/pom.xml
index 076a0f2d3..c5717513b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -30,13 +30,13 @@
   <scm>
     <url>https://github.com/qos-ch/slf4j</url>
     <connection>scm:git:https://github.com/qos-ch/slf4j.git</connection>
-  </scm>  
+  </scm>
 
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
-    <project.build.outputTimestamp>2022-12-12T19:19:39Z</project.build.outputTimestamp>    
+    <project.build.outputTimestamp>2022-12-12T19:19:39Z</project.build.outputTimestamp>
     <latest.stable.version>1.7.36</latest.stable.version>
-    <latest.2.version>2.0.0-alpha7</latest.2.version>    
+    <latest.2.version>2.0.0-alpha7</latest.2.version>
     <!-- java.util.ServiceLoader requires Java 6 -->
     <jdk.version>8</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
@@ -47,8 +47,9 @@
     <!-- used in integration testing -->
     <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version>
     <cal10n.version>0.8.1</cal10n.version>
-    <reload4j.version>1.2.22</reload4j.version>    
+    <reload4j.version>1.2.22</reload4j.version>
     <logback.version>1.2.10</logback.version>
+    <jcl.version>1.2</jcl.version>
     <junit.version>4.13.1</junit.version>
     <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -58,9 +59,7 @@
     <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
     <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
     <maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version>
-    <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
-    <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
-            
+    <bnd.version>6.4.0</bnd.version>
   </properties>
 
   <developers>
@@ -78,7 +77,7 @@
     <module>slf4j-jdk14</module>
     <module>slf4j-jdk-platform-logging</module>
     <module>slf4j-log4j12</module>
-    <module>slf4j-reload4j</module>    
+    <module>slf4j-reload4j</module>
     <module>slf4j-ext</module>
     <module>jcl-over-slf4j</module>
     <module>log4j-over-slf4j</module>
@@ -96,6 +95,12 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.annotation</artifactId>
+      <version>${bnd.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <dependencyManagement>
@@ -113,7 +118,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
@@ -125,7 +129,7 @@
         <artifactId>reload4j</artifactId>
         <version>${reload4j.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>ch.qos.cal10n</groupId>
         <artifactId>cal10n-api</artifactId>
@@ -192,14 +196,14 @@
               <source>${jdk.version}</source>
               <target>${jdk.version}</target>
             </configuration>
-          </execution> 
+          </execution>
 
-          <execution>                      
+          <execution>
             <id>module-compile</id>
             <phase>compile</phase>
             <goals>
               <goal>compile</goal>
-            </goals>          
+            </goals>
             <configuration>
               <release>9</release>
               <compileSourceRoots>
@@ -209,8 +213,6 @@
             </configuration>
           </execution>
 
-
-
         </executions>
 
       </plugin>
@@ -238,27 +240,39 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${maven-bundle-plugin.version}</version>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <version>${bnd.version}</version>
+        <configuration>
+          <!-- populated by the plugin itself -->
+          <bnd><![CDATA[
+            # Use $[ .. ] to defer variable subtitution to bnd to not get this parent's values
+
+            Bundle-SymbolicName: ${replacestring;${project.artifactId};-;.}
+            Bundle-Name: $[project.artifactId]
+            Bundle-Vendor: SLF4J.ORG
+            -snapshot:
+
+            Import-Package: org.slf4j.*
+            -exportcontents: org.slf4j.*
+            
+            X-Compile-Source-JDK: ${maven.compiler.source}
+            X-Compile-Target-JDK: ${maven.compiler.target}
+            Implementation-Version: ${project.version}
+            Implementation-Title: $[project.artifactId]
+            Multi-Release: true
+
+            -removeheaders: Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource
+            -fixupmessages: 'Classes found in the wrong directory: .*'
+          ]]></bnd>
+        </configuration>
         <executions>
           <execution>
             <id>bundle-manifest</id>
             <phase>process-classes</phase>
             <goals>
-              <goal>manifest</goal>
+              <goal>bnd-process</goal>
             </goals>
-            <configuration>
-              <instructions>
-                <!-- populated by the plugin itself -->
-                <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                <Bundle-Description>${project.description}</Bundle-Description>
-                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-                <Implementation-Version>${project.version}</Implementation-Version>
-                <Multi-Release>true</Multi-Release>
-              </instructions>
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -293,21 +307,6 @@
         </executions>
       </plugin>
 
-      <!-- as suggested in http://jira.qos.ch/browse/SLF4J-143 -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>${build-helper-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>parse-version</id>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -319,8 +318,8 @@
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>3.0.0</version>
       </plugin>
+
     </plugins>
-  
   </build>
 
   <reporting>
@@ -335,7 +334,7 @@
           <linkJavadoc>true</linkJavadoc>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -382,7 +381,7 @@
           </groups>
         </configuration>
       </plugin>
-      
+
     </plugins>
   </reporting>
 
@@ -450,8 +449,7 @@
         </plugins>
       </build>
 
-      <pluginRepositories>
-      </pluginRepositories>
+      <pluginRepositories />
     </profile>
 
     <profile>
@@ -506,16 +504,15 @@
 
   <pluginRepositories>
     <pluginRepository>
-         <id>apache-snapshot-repo</id>
-         <name>apache-snapshot-repo</name>
-         <url>https://repository.apache.org/content/groups/snapshots/</url>
-         <releases>
-           <enabled>false</enabled>
-         </releases>
-         <snapshots>
-           <enabled>true</enabled>
-         </snapshots>
-
+      <id>apache-snapshot-repo</id>
+      <name>apache-snapshot-repo</name>
+      <url>https://repository.apache.org/content/groups/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
     </pluginRepository>
   </pluginRepositories>
 
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 1a19a326e..594f40bce 100755
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -53,6 +53,16 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Import-Package: org.slf4j.spi;version="${range;[===,+);${version;===;${maven_version;${project.version}}}}"
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
     </plugins>
 
   </build>
diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 06828e5e3..64051cf71 100755
--- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -46,7 +46,7 @@
 import org.slf4j.helpers.Util;
 import org.slf4j.spi.SLF4JServiceProvider;
 
-import javax.accessibility.AccessibleComponent;
+import aQute.bnd.annotation.spi.ServiceConsumer;
 
 /**
  * The <code>LoggerFactory</code> is a utility class producing Loggers for
@@ -66,6 +66,7 @@
  * @author Ceki G&uuml;lc&uuml;
  * 
  */
+@ServiceConsumer(SLF4JServiceProvider.class)
 public final class LoggerFactory {
 
     static final String CODES_PREFIX = "https://www.slf4j.org/codes.html";
diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index eb0a28705..000000000
--- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Implementation-Title: slf4j-api
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.api
-Bundle-Name: slf4j-api
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j;version=${parsedVersion.osgiVersion},
-  org.slf4j.spi;version=${parsedVersion.osgiVersion},
-  org.slf4j.helpers;version=${parsedVersion.osgiVersion},
-  org.slf4j.event;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j.spi;version=${parsedVersion.osgiVersion}
-Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
- celoader.processor)(version>=1.0.0)(!(version>=2.0.0)))",osgi.service
- loader;filter:="(osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvide
- r)";osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider"
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index cedf731d4..4cec86568 100755
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -73,8 +73,26 @@
           </archive>
         </configuration>
       </plugin>
-    </plugins>
 
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Import-Package: \
+              ch.qos.cal10n;version="${cal10n.version}";resolution:="optional",\
+              org.slf4j,\
+              org.slf4j.spi,\
+              org.slf4j.helpers
+            -exportcontents: \
+              org.slf4j.ext,\
+              org.slf4j.profiler,\
+              org.slf4j.cal10n
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
+    </plugins>
   </build>
 
 </project>
diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69292764..000000000
--- a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Implementation-Title: slf4j-ext
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.ext
-Bundle-Name: slf4j-ext
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.profiler;version=${parsedVersion.osgiVersion}, org.slf4j.cal10n;version=${parsedVersion.osgiVersion}, org.slf4j.ext;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, ch.qos.cal10n;version=${cal10n.version};resolution:=optional
diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml
index 907fd677b..21062c9fd 100644
--- a/slf4j-jdk-platform-logging/pom.xml
+++ b/slf4j-jdk-platform-logging/pom.xml
@@ -49,20 +49,20 @@
               <source>9</source>
               <target>9</target>
               <release>9</release>
-            </configuration>            
+            </configuration>
           </execution>
           <execution>
             <id>default-testCompile</id>
             <goals>
-              <goal>testCompile</goal> 
+              <goal>testCompile</goal>
             </goals>
             <configuration>
               <source>9</source>
               <target>9</target>
               <release>9</release>
-            </configuration>            
-          </execution> 
-        </executions>        
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -77,7 +77,6 @@
         </configuration>
       </plugin>
 
-
     </plugins>
   </build>
 
diff --git a/slf4j-jdk-platform-logging/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk-platform-logging/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index d07332267..000000000
--- a/slf4j-jdk-platform-logging/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Implementation-Title:  slf4j-jdk-platform-logging
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName:  slf4j.jdk.platform.logging
-Bundle-Name: slf4j-jdk-platform-logging
-Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api
-Bundle-RequiredExecutionEnvironment: JavaSE-9
-Export-Package: slf4j.jdk.platform.logging;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/jul/JULServiceProvider.java b/slf4j-jdk14/src/main/java/org/slf4j/jul/JULServiceProvider.java
index 5e9a74edd..c6a8859b6 100755
--- a/slf4j-jdk14/src/main/java/org/slf4j/jul/JULServiceProvider.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/jul/JULServiceProvider.java
@@ -7,6 +7,9 @@
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(value = SLF4JServiceProvider.class, attribute = { "type=jul" })
 public class JULServiceProvider implements SLF4JServiceProvider {
 
     /**
@@ -30,6 +33,7 @@ public IMarkerFactory getMarkerFactory() {
         return markerFactory;
     }
 
+    @Override
     public MDCAdapter getMDCAdapter() {
         return mdcAdapter;
     }
diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index c7401272f..000000000
--- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Implementation-Title: slf4j-jdk14
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.jdk14
-Bundle-Name: slf4j-jdk14
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.jul;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
- org.slf4j.spi;version=${parsedVersion.osgiVersion},
- org.slf4j.helpers;version=${parsedVersion.osgiVersion},
- org.slf4j.event;version=${parsedVersion.osgiVersion}
-Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
- pi.SLF4JServiceProvider";type=jul;effective:=active,osgi.serviceloade
- r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
- org.slf4j.jul.JULServiceProvider";type=jul
-Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
- celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
diff --git a/slf4j-jdk14/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j-jdk14/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
deleted file mode 100755
index 8d062b2fc..000000000
--- a/slf4j-jdk14/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.slf4j.jul.JULServiceProvider
\ No newline at end of file
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index 3ce68138f..b3f318477 100755
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -16,4 +16,8 @@
   <name>SLF4J Migrator</name>
   <description>SLF4J Migrator</description>
 
+  <properties>
+    <bnd.skip>true</bnd.skip>
+  </properties>
+
 </project>
diff --git a/slf4j-migrator/src/main/resources/META-INF/MANIFEST.MF b/slf4j-migrator/src/main/resources/META-INF/MANIFEST.MF
index 10f5bdf34..b11f62376 100644
--- a/slf4j-migrator/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-migrator/src/main/resources/META-INF/MANIFEST.MF
@@ -1 +1 @@
-Main-Class: org.slf4j.migrator.Main
\ No newline at end of file
+Main-Class: org.slf4j.migrator.Main
diff --git a/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java b/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java
index 515cf23b2..1781c4305 100755
--- a/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java
+++ b/slf4j-nop/src/main/java/org/slf4j/nop/NOPServiceProvider.java
@@ -8,6 +8,9 @@
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(value = SLF4JServiceProvider.class, attribute = { "type=nop" })
 public class NOPServiceProvider implements SLF4JServiceProvider {
 
     /**
@@ -21,14 +24,17 @@ public class NOPServiceProvider implements SLF4JServiceProvider {
     private final IMarkerFactory markerFactory = new BasicMarkerFactory();
     private final MDCAdapter mdcAdapter = new NOPMDCAdapter();
 
+    @Override
     public ILoggerFactory getLoggerFactory() {
         return loggerFactory;
     }
 
+    @Override
     public IMarkerFactory getMarkerFactory() {
         return markerFactory;
     }
 
+    @Override
     public MDCAdapter getMDCAdapter() {
         return mdcAdapter;
     }
@@ -38,9 +44,9 @@ public String getRequestedApiVersion() {
         return REQUESTED_API_VERSION;
     }
 
+    @Override
     public void initialize() {
 
     }
 
-   
 }
diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index e8026f444..000000000
--- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Implementation-Title: slf4j-nop
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.nop
-Bundle-Name: slf4j-nop
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.nop;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
- org.slf4j.spi;version=${parsedVersion.osgiVersion},
- org.slf4j.helpers;version=${parsedVersion.osgiVersion},
- org.slf4j.event;version=${parsedVersion.osgiVersion}
-Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
- pi.SLF4JServiceProvider";type=nop;effective:=active,osgi.serviceloade
- r;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="
- org.slf4j.nop.NOPServiceProvider";type=nop
-Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
- celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
diff --git a/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
deleted file mode 100755
index 9929e9df0..000000000
--- a/slf4j-nop/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.slf4j.nop.NOPServiceProvider
\ No newline at end of file
diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml
index 5fda30264..c5f77c7bc 100644
--- a/slf4j-reload4j/pom.xml
+++ b/slf4j-reload4j/pom.xml
@@ -12,13 +12,11 @@
 
   <artifactId>slf4j-reload4j</artifactId>
 
-
   <packaging>jar</packaging>
- <name>SLF4J Reload4j Binding</name>
+  <name>SLF4J Reload4j Binding</name>
   <description>SLF4J Reload4j Binding</description>
   <url>http://reload4j.qos.ch</url>
-  
-  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -29,7 +27,7 @@
       <groupId>ch.qos.reload4j</groupId>
       <artifactId>reload4j</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -39,10 +37,9 @@
     </dependency>
   </dependencies>
 
-
   <build>
     <plugins>
-        
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -59,9 +56,20 @@
           <argLine>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8001</argLine>
           <!--<argLine>XXadd-opens log4j/org.apache.log4j=org.slf4j.log4j12</argLine>-->
         </configuration>
-      </plugin>     
-        
- 
+      </plugin>
+
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <configuration>
+          <bnd><![CDATA[
+            Import-Package: \
+              org.apache.log4j;version="${range;[==,+)}",\
+              org.slf4j.*
+          ]]></bnd>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jServiceProvider.java b/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jServiceProvider.java
index 4625b09ca..d5b75ba1b 100644
--- a/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jServiceProvider.java
+++ b/slf4j-reload4j/src/main/java/org/slf4j/reload4j/Reload4jServiceProvider.java
@@ -8,6 +8,9 @@
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(value = SLF4JServiceProvider.class, attribute = { "type=reload4j" })
 public class Reload4jServiceProvider implements SLF4JServiceProvider {
 
     /**
@@ -42,13 +45,11 @@ public ILoggerFactory getLoggerFactory() {
         return loggerFactory;
     }
 
-
     @Override
     public IMarkerFactory getMarkerFactory() {
         return markerFactory;
     }
 
-
     @Override
     public MDCAdapter getMDCAdapter() {
         return mdcAdapter;
diff --git a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF b/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index fed77da50..000000000
--- a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Implementation-Title: slf4j-reload4j
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.reload4j
-Bundle-Name: slf4j-reload4j
-Bundle-Vendor: SLF4J.ORG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.reload4j;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
- org.slf4j.spi;version=${parsedVersion.osgiVersion},
- org.slf4j.helpers;version=${parsedVersion.osgiVersion},
- org.slf4j.event;version=${parsedVersion.osgiVersion},
- org.apache.log4j
-Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
- pi.SLF4JServiceProvider";type=reload4j;effective:=active,osgi.service
- loader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";regist
- er:="org.slf4j.reload4j.Reload4jServiceProvider";type=reload4j
-Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
- celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
diff --git a/slf4j-reload4j/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j-reload4j/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
deleted file mode 100644
index b81f3e12f..000000000
--- a/slf4j-reload4j/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.slf4j.reload4j.Reload4jServiceProvider
diff --git a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleServiceProvider.java b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleServiceProvider.java
index 795200dc5..4227335ed 100755
--- a/slf4j-simple/src/main/java/org/slf4j/simple/SimpleServiceProvider.java
+++ b/slf4j-simple/src/main/java/org/slf4j/simple/SimpleServiceProvider.java
@@ -7,6 +7,9 @@
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(value = SLF4JServiceProvider.class, attribute = { "type=simple" })
 public class SimpleServiceProvider implements SLF4JServiceProvider {
 
     /**
@@ -20,6 +23,7 @@ public class SimpleServiceProvider implements SLF4JServiceProvider {
     private IMarkerFactory markerFactory;
     private MDCAdapter mdcAdapter;
 
+    @Override
     public ILoggerFactory getLoggerFactory() {
         return loggerFactory;
     }
diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100755
index 9e8d817a9..000000000
--- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Implementation-Title: slf4j-simple
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.simple
-Bundle-Name: slf4j-simple
-Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.slf4j.simple;version=${parsedVersion.osgiVersion}
-Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
- org.slf4j.spi;version=${parsedVersion.osgiVersion},
- org.slf4j.helpers;version=${parsedVersion.osgiVersion},
- org.slf4j.event;version=${parsedVersion.osgiVersion}
-Provide-Capability: osgi.service;objectClass:List<String>="org.slf4j.s
- pi.SLF4JServiceProvider";type=simple;effective:=active,osgi.servicelo
- ader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register
- :="org.slf4j.simple.SimpleServiceProvider";type=simple 
-Require-Capability: osgi.extender;filter:="(&(osgi.extender=osgi.servi
- celoader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
diff --git a/slf4j-simple/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/slf4j-simple/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
deleted file mode 100755
index 5cda44908..000000000
--- a/slf4j-simple/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.slf4j.simple.SimpleServiceProvider
\ No newline at end of file