diff --git a/features/karaf/src/main/feature/feature.xml b/features/karaf/src/main/feature/feature.xml
index bed4f6f03..c7aea5784 100644
--- a/features/karaf/src/main/feature/feature.xml
+++ b/features/karaf/src/main/feature/feature.xml
@@ -18,6 +18,11 @@
       <capability>esh.tp;feature=jupnp</capability>
     </feature>
 
+    <feature name="esh-tp-jmdns" version="${project.version}">
+      <bundle>mvn:org.jmdns/jmdns/${jmdns.version}</bundle>
+      <capability>esh.tp;feature=jmdns</capability>
+    </feature>
+
     <feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
         <feature>esh-base</feature>
         <feature>esh-io-console-karaf</feature>
diff --git a/pom.xml b/pom.xml
index 3db76d92d..a572a7309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
         <esh.version>0.8.0-SNAPSHOT</esh.version>
         <shk.version>1.2</shk.version>
         <jupnp.version>2.1.0</jupnp.version>
+        <jmdns.version>3.4.3</jmdns.version>
         <dep.karaf.version>4.0.3</dep.karaf.version>
         <karaf.maven.plugin.version>4.0.3</karaf.maven.plugin.version>
         <karaf.features.version>4.0.3</karaf.features.version>
@@ -172,6 +173,18 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>jmdns-bintray</id>
+            <name>Bintray Repository for openhab</name>
+            <url>https://dl.bintray.com/jmdns/mvn</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
 
         <!-- openHAB snapshots -->
         <repository>