diff --git a/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF b/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF
index 39fe9f0c1b5db..334af8629fd7d 100644
--- a/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF
+++ b/addons/io/org.openhab.io.homekit/META-INF/MANIFEST.MF
@@ -33,9 +33,7 @@ Import-Package: com.google.common.collect,
  org.eclipse.smarthome.io.console.extensions,
  org.eclipse.smarthome.model.item,
  org.osgi.framework,
- org.osgi.service.cm,
  org.osgi.service.component,
- org.osgi.service.component.annotations,
  org.osgi.service.event,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
diff --git a/addons/io/org.openhab.io.homekit/build.properties b/addons/io/org.openhab.io.homekit/build.properties
index 78ec0be4b42e6..e606c5fcf7037 100644
--- a/addons/io/org.openhab.io.homekit/build.properties
+++ b/addons/io/org.openhab.io.homekit/build.properties
@@ -10,4 +10,5 @@ bin.includes = META-INF/,\
                lib/net.i2p.crypto.eddsa-0.0.1-SNAPSHOT.jar,\
                lib/org.bouncycastle.bcprov-jdk15on-1.51.jar,\
                lib/org.glassfish.javax.json-1.0.4.jar,\
-               lib/org.zeromq.curve25519-java-0.1.0.jar
+               lib/org.zeromq.curve25519-java-0.1.0.jar,\
+               about.html
diff --git a/addons/io/org.openhab.io.homekit/pom.xml b/addons/io/org.openhab.io.homekit/pom.xml
index 1bdd862b9e1f7..9227ecfd82c36 100644
--- a/addons/io/org.openhab.io.homekit/pom.xml
+++ b/addons/io/org.openhab.io.homekit/pom.xml
@@ -9,9 +9,7 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.openhab.io</groupId>
   <artifactId>org.openhab.io.homekit</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
 
   <name>HomeKit Integration</name>
   <packaging>eclipse-plugin</packaging>
diff --git a/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java b/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
index 356f044d9a07c..2d8cfed54292b 100644
--- a/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
+++ b/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
@@ -16,8 +16,6 @@
 import org.eclipse.smarthome.core.storage.StorageService;
 import org.openhab.io.homekit.Homekit;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Deactivate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +45,6 @@ public void setItemRegistry(ItemRegistry itemRegistry) {
         changeListener.setItemRegistry(itemRegistry);
     }
 
-    @Activate
     protected synchronized void activate(ComponentContext componentContext) {
         try {
             settings.fill(componentContext.getProperties());
@@ -63,7 +60,6 @@ protected synchronized void activate(ComponentContext componentContext) {
         }
     }
 
-    @Deactivate
     protected void deactivate() {
         changeListener.clearAccessories();
         bridge.stop();
diff --git a/features/openhab-addons/src/main/feature/feature.xml b/features/openhab-addons/src/main/feature/feature.xml
index a0f24cf39ed7a..f5b3c8a7ec35b 100644
--- a/features/openhab-addons/src/main/feature/feature.xml
+++ b/features/openhab-addons/src/main/feature/feature.xml
@@ -118,6 +118,12 @@
         <bundle start-level="80">mvn:org.openhab.addons.io/org.openhab.io.myopenhab/${project.version}</bundle>
     </feature>
 
+    <feature name="openhab-misc-homekit" description="HomeKit Integration" version="${project.version}">
+        <feature>openhab-runtime-base</feature>
+        <feature>openhab-transport-mdns</feature>
+        <bundle start-level="80">mvn:org.openhab.addons.io/org.openhab.io.homekit/${project.version}</bundle>
+    </feature>
+
     <!-- ui -->
 
     <feature name="openhab-ui-cometvisu" description="CometVisu" version="${project.version}">