diff --git a/bundles/org.openhab.binding.exec/src/main/feature/feature.xml b/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
index 19de0c221..ff73780e2 100644
--- a/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.exec/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
openhab-runtime-base
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/exec.whitelist
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/exec.whitelist
mvn:org.openhab.addons.bundles/org.openhab.binding.exec/${project.version}
diff --git a/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml b/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
index eeaaf929a..4292bff68 100644
--- a/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.leapmotion/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
openhab-runtime-base
mvn:org.openhab.addons.bundles/org.openhab.binding.leapmotion/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/lib/libLeap
- mvn:${project.groupId}/openhab-addons-external/${project.version}/lib/libLeapJava
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/lib/libLeap
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/lib/libLeapJava
diff --git a/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml b/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
index 20fb95b9e..aebf836fc 100644
--- a/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
+++ b/bundles/org.openhab.io.openhabcloud/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
openhab-runtime-base
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/openhabcloud
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/openhabcloud
mvn:org.json/json/20180813
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.8.1_1
diff --git a/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml b/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
index 78a0a03b4..7822ffa43 100644
--- a/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.dynamodb/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
openhab-runtime-base
mvn:org.openhab.addons.bundles/org.openhab.persistence.dynamodb/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/dynamodb
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/dynamodb
diff --git a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
index 877ec967c..f539a8486 100644
--- a/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.influxdb/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
openhab-runtime-base
mvn:org.openhab.addons.bundles/org.openhab.persistence.influxdb/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/influxdb
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/influxdb
diff --git a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
index 320c6c12f..0d6d97c2e 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.jdbc/src/main/feature/feature.xml
@@ -4,49 +4,49 @@
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:org.apache.derby/derbyclient/${derby.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:com.h2database/h2/${h2.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:org.hsqldb/hsqldb/${hsqldb.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:mysql/mysql-connector-java/${mysql.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:org.postgresql/postgresql/${postgresql.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jdbc
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jdbc
openhab-runtime-base
mvn:org.xerial/sqlite-jdbc/${sqlite.version}
mvn:org.openhab.addons.bundles/org.openhab.persistence.jdbc/${project.version}
diff --git a/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml b/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
index 05652505a..f17a9b7b4 100644
--- a/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.jpa/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
openhab-runtime-base
mvn:org.openhab.addons.bundles/org.openhab.persistence.jpa/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/jpa
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/jpa
diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml b/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
index dc241df19..0a6f589fd 100644
--- a/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
+++ b/bundles/org.openhab.persistence.rrd4j/src/main/feature/feature.xml
@@ -5,7 +5,7 @@
openhab-runtime-base
mvn:org.openhab.addons.bundles/org.openhab.persistence.rrd4j/${project.version}
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/rrd4j
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/rrd4j
diff --git a/bundles/org.openhab.transform.exec/src/main/feature/feature.xml b/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
index c4960a913..be0a4087d 100644
--- a/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
+++ b/bundles/org.openhab.transform.exec/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
openhab-runtime-base
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/exec.whitelist
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/exec.whitelist
mvn:org.openhab.addons.bundles/org.openhab.transform.exec/${project.version}
diff --git a/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml b/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
index 1300eb733..20e49aa16 100644
--- a/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
+++ b/bundles/org.openhab.voice.voicerss/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
openhab-runtime-base
- mvn:${project.groupId}/openhab-addons-external/${project.version}/cfg/voicerss
+ mvn:${project.groupId}/org.openhab.addons.features.karaf.openhab-addons-external/${project.version}/cfg/voicerss
mvn:org.openhab.addons.bundles/org.openhab.voice.voicerss/${project.version}
diff --git a/features/openhab-addons-external/pom.xml b/features/openhab-addons-external/pom.xml
index efc68cb9c..b70aadba5 100644
--- a/features/openhab-addons-external/pom.xml
+++ b/features/openhab-addons-external/pom.xml
@@ -35,6 +35,11 @@
cfg
dynamodb
+
+ src/main/resources/conf/exec.whitelist
+ cfg
+ exec.whitelist
+
src/main/resources/conf/influxdb.cfg
cfg
@@ -55,11 +60,31 @@
cfg
mapdb
+
+ src/main/resources/conf/openhabcloud.cfg
+ cfg
+ openhabcloud
+
src/main/resources/conf/rrd4j.cfg
cfg
rrd4j
+
+ src/main/resources/conf/voicerss.cfg
+ cfg
+ voicerss
+
+
+ src/main/resources/lib/libLeap.dylib
+ lib
+ libLeap
+
+
+ src/main/resources/lib/libLeapJava.dylib
+ lib
+ libLeapJava
+
diff --git a/features/openhab-addons-external/src/main/resources/conf/exec.whitelist b/features/openhab-addons-external/src/main/resources/conf/exec.whitelist
new file mode 100644
index 000000000..93a296021
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/exec.whitelist
@@ -0,0 +1,2 @@
+# For security reasons all commands that are used by the exec binding or transformation need to be whitelisted.
+# Every command needs to be listed on a separate line below.
diff --git a/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg b/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg
new file mode 100644
index 000000000..4fe2c8348
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/openhabcloud.cfg
@@ -0,0 +1,19 @@
+############################## openHAB Cloud Connector #############################
+
+# The URL of the openHAB Cloud service to connect to.
+# Optional, default is set to the service offered by the openHAB Foundation
+# (https://myopenhab.org/)
+#baseURL=
+
+# Defines the mode in which you want to operate the connector.
+# Possible values are:
+# - notification: Only push notifications are enabled, no remote access is allowed.
+# - remote: Push notifications and remote access are enabled.
+# Optional, default is 'remote'.
+#mode=
+
+# A comma-separated list of items to be exposed to external services like IFTTT.
+# Events of those items are pushed to the openHAB Cloud and commands received for
+# these items from the openHAB Cloud service are accepted and sent to the local bus.
+# Optional, default is an empty list.
+#expose=
diff --git a/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg b/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg
new file mode 100644
index 000000000..3c43f5a9a
--- /dev/null
+++ b/features/openhab-addons-external/src/main/resources/conf/voicerss.cfg
@@ -0,0 +1,5 @@
+######################## VoiceRSS Text-to-Speech Engine ########################
+
+# API key you got when you subscribed to the Voice RSS service
+# Open your profile to get the value: http://www.voicerss.org/personel/
+#apiKey=1234567890
diff --git a/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib b/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib
new file mode 100644
index 000000000..5b7ba739b
Binary files /dev/null and b/features/openhab-addons-external/src/main/resources/lib/libLeap.dylib differ
diff --git a/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib b/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib
new file mode 100644
index 000000000..63d30eb76
Binary files /dev/null and b/features/openhab-addons-external/src/main/resources/lib/libLeapJava.dylib differ
diff --git a/features/openhab-addons/pom.xml b/features/openhab-addons/pom.xml
index 563af490b..28fd45d10 100644
--- a/features/openhab-addons/pom.xml
+++ b/features/openhab-addons/pom.xml
@@ -52,7 +52,8 @@
-
+