diff --git a/build.gradle b/build.gradle
index 5fee7a9cd..fdcc6a880 100644
--- a/build.gradle
+++ b/build.gradle
@@ -280,7 +280,7 @@ subprojects {
 	}
 }
 
-['smack-resolver-javax', 'smack-resolver-dnsjava', 'smack-resolver-minidns', 'smack-sasl-javax', 'smack-sasl-provided'].each { name ->
+['smack-resolver-javax', 'smack-resolver-dnsjava', 'smack-resolver-minidns', 'smack-sasl-javax', 'smack-sasl-provided', 'smack-java7'] .each { name ->
 	project(":$name") {
 		jar {
 			manifest {
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java b/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
index d7e2c06f4..64a32d629 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java
@@ -19,13 +19,13 @@ package org.jivesoftware.smack.java7;
 import java.util.List;
 
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.initializer.SimpleSmackInitializer;
+import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 import org.jivesoftware.smack.util.stringencoder.Base64UrlSafeEncoder;
 import org.jivesoftware.smack.util.stringencoder.java7.Java7Base64Encoder;
 import org.jivesoftware.smack.util.stringencoder.java7.Java7Base64UrlSafeEncoder;
 
-public class Java7SmackInitializer extends SimpleSmackInitializer {
+public class Java7SmackInitializer extends SmackAndOsgiInitializer {
 
     @Override
     public List<Exception> initialize() {
diff --git a/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml b/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml
new file mode 100644
index 000000000..4fa757d15
--- /dev/null
+++ b/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0"
+	enabled="true" immediate="true" name="Smack Java7 API">
+	<implementation
+		class="org.jivesoftware.smack.java7.Java7SmackInitializer" />
+</scr:component>