diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 474b40c9..d51b08da 100755
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -31,4 +31,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Automatic-Module-Name>jul.to.slf4j</Automatic-Module-Name>
+          </instructions>
+        </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 d920e016..00000000
--- a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-ManifestVersion: 2
-Automatic-Module-Name: jul.to.slf4j
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index a2e2c9c1..52710332 100755
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -41,4 +41,20 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <_exportcontents>org.apache.log4j*;version=${reload4j.version};-noimport:=true</_exportcontents>
+          </instructions>
+        </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 dacefbee..00000000
--- a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-ManifestVersion: 2
-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}
diff --git a/pom.xml b/pom.xml
index f3c0bc90..ff381d0a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -474,6 +474,35 @@
       </build>
     </profile>
 
+    <profile>
+      <id>generate-osgi-service-loader-mediator-entries</id>
+      <activation>
+        <file>
+          <exists>src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider</exists>
+        </file>
+      </activation>
+      <build>
+        <!-- Add the OSGi Service Loader Mediator Specification Manifest entries for each module that has a SLF4JServiceProvider Service-Loader file.-->
+        <plugins>
+          <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+              <instructions>
+                <Provide-Capability><![CDATA[
+                  osgi.service;objectClass:List<String>="org.slf4j.spi.SLF4JServiceProvider";type=${slf4j.provider.type};effective:=active,
+                  osgi.serviceloader;osgi.serviceloader="org.slf4j.spi.SLF4JServiceProvider";register:="${slf4j.provider.implementation}";type=${slf4j.provider.type}
+                ]]></Provide-Capability>
+                <Require-Capability><![CDATA[
+                  osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))"
+                ]]></Require-Capability>
+              </instructions>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!--
     <profile>
       <id>travis</id>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index d22252f2..6639b1e5 100755
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -18,6 +18,8 @@
 
   <properties>
     <module-name>org.slf4j.jul</module-name>
+    <slf4j.provider.implementation>org.slf4j.jul.JULServiceProvider</slf4j.provider.implementation>
+    <slf4j.provider.type>jul</slf4j.provider.type>
   </properties>
 
   <dependencies>
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 d2980de9..00000000
--- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-ManifestVersion: 2
-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-nop/pom.xml b/slf4j-nop/pom.xml
index 87291dff..b94300f1 100755
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -19,6 +19,8 @@
 
   <properties>
     <module-name>org.slf4j.nop</module-name>
+    <slf4j.provider.implementation>org.slf4j.nop.NOPServiceProvider</slf4j.provider.implementation>
+    <slf4j.provider.type>nop</slf4j.provider.type>
   </properties>
 
   <dependencies>
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 4755f705..00000000
--- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-ManifestVersion: 2
-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-reload4j/pom.xml b/slf4j-reload4j/pom.xml
index 8d8727b2..6ed24dae 100644
--- a/slf4j-reload4j/pom.xml
+++ b/slf4j-reload4j/pom.xml
@@ -18,6 +18,10 @@
   <description>SLF4J Reload4j Provider</description>
   <url>http://reload4j.qos.ch</url>
 
+  <properties>
+    <slf4j.provider.implementation>org.slf4j.reload4j.Reload4jServiceProvider</slf4j.provider.implementation>
+    <slf4j.provider.type>reload4j</slf4j.provider.type>
+  </properties>
 
   <dependencies>
     <dependency>
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 e701b347..00000000
--- a/slf4j-reload4j/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-ManifestVersion: 2
-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-simple/pom.xml b/slf4j-simple/pom.xml
index e7130ac6..debdc03a 100755
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -18,6 +18,8 @@
 
   <properties>
     <module-name>org.slf4j.simple</module-name>
+    <slf4j.provider.implementation>org.slf4j.simple.SimpleServiceProvider</slf4j.provider.implementation>
+    <slf4j.provider.type>simple</slf4j.provider.type>
   </properties>
 
   <dependencies>
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 2c8f4502..00000000
--- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-ManifestVersion: 2
-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)))"