diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index ba0b24315cb..1a175768ba3 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -215,7 +215,25 @@
     <dependency>
       <groupId>org.jupnp</groupId>
       <artifactId>org.jupnp</artifactId>
-      <version>3.0.5</version>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.jetty9</artifactId>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.javax.servlet</artifactId>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.javax.httpservice</artifactId>
+      <version>${jupnp.version}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 11d40f9cd78..c974505a5c9 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -487,7 +487,25 @@
     <dependency>
       <groupId>org.jupnp</groupId>
       <artifactId>org.jupnp</artifactId>
-      <version>3.0.5</version>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.jetty9</artifactId>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.javax.servlet</artifactId>
+      <version>${jupnp.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jupnp</groupId>
+      <artifactId>org.jupnp.transport.javax.httpservice</artifactId>
+      <version>${jupnp.version}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index ca4bd8c1831..77d9708bedc 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -201,11 +201,19 @@
 	</feature>
 
 	<feature name="openhab.tp-jupnp" description="UPnP/DLNA library for Java" version="${project.version}">
-		<capability>openhab.tp;feature=jupnp;version=3.0.5</capability>
+		<capability>openhab.tp;feature=jupnp;version=${jupnp.version}</capability>
 		<feature dependency="true">http</feature>
 		<feature dependency="true">scr</feature>
 		<feature dependency="true">openhab.tp-httpclient</feature>
-		<bundle>mvn:org.jupnp/org.jupnp/3.0.5</bundle>
+		<bundle>mvn:org.jupnp/org.jupnp/${jupnp.version}</bundle>
+		<!-- jUPnP no longer bundles a transport implementation; the Jetty 9 transport (and the
+			generic servlet transport infrastructure it depends on) must be added explicitly. -->
+		<bundle>mvn:org.jupnp/org.jupnp.transport.javax.servlet/${jupnp.version}</bundle>
+		<bundle>mvn:org.jupnp/org.jupnp.transport.jetty9/${jupnp.version}</bundle>
+		<!-- Without this bridge, OSGiUpnpServiceConfiguration falls through to jetty9's standalone
+			StreamServer, which opens its own socket on the UPnP callback port (default 8080) instead
+			of sharing openHAB's existing HttpService - colliding with pax-web on that same port. -->
+		<bundle>mvn:org.jupnp/org.jupnp.transport.javax.httpservice/${jupnp.version}</bundle>
 	</feature>
 
 	<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
diff --git a/pom.xml b/pom.xml
index 509de9dc38b..78142043faf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
     <bouncycastle.version>1.85</bouncycastle.version>
     <commons.net.version>3.13.0</commons.net.version>
     <eea.version>2.4.0</eea.version>
+    <jupnp.version>4.0.0-SNAPSHOT</jupnp.version>
     <karaf.compile.version>4.4.11</karaf.compile.version>
     <karaf.tooling.version>4.4.11</karaf.tooling.version>
     <sat.version>0.18.0</sat.version>