diff --git a/features/karaf/src/main/feature/feature.xml b/features/karaf/src/main/feature/feature.xml
index 8f3e3553d..bed4f6f03 100644
--- a/features/karaf/src/main/feature/feature.xml
+++ b/features/karaf/src/main/feature/feature.xml
@@ -11,6 +11,13 @@
 -->
 <features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
 
+    <feature name="esh-tp-jupnp" version="${project.version}">
+      <feature dependency="true">http</feature>
+      <feature>shk-apache-httpclient</feature>
+      <bundle>mvn:org.jupnp/org.jupnp/${jupnp.version}</bundle>
+      <capability>esh.tp;feature=jupnp</capability>
+    </feature>
+
     <feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
         <feature>esh-base</feature>
         <feature>esh-io-console-karaf</feature>
@@ -35,7 +42,6 @@
         <bundle start-level="20">mvn:org.openhab.core/org.openhab.io.jetty.certificate/${project.version}</bundle>
     </feature>
 
-
     <feature name="openhab-package-minimal" description="openHAB Minimal Package" version="${project.version}">
         <feature>openhab-runtime-base</feature>
         <feature>openhab-dashboard</feature>
diff --git a/pom.xml b/pom.xml
index 074e58d81..1fbd018ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,9 @@
         <maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
 
         <ohdr.version>1.0.0</ohdr.version>
-        <esh.version>0.8.0.b2</esh.version>
+        <esh.version>0.8.0-SNAPSHOT</esh.version>
         <shk.version>1.2</shk.version>
+        <jupnp.version>2.1.0.RC1</jupnp.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>