diff --git a/NEWS b/NEWS
index 0de0a829c..d59b2eff3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.19.3 (not yet released)
+* database
+  - upnp: fix breakage due to malformed URIs
 * decoder
   - audiofile: fix crash while playing streams
 
diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx
index ee7c0d7f5..0e5d2d955 100644
--- a/src/lib/upnp/ContentDirectoryService.cxx
+++ b/src/lib/upnp/ContentDirectoryService.cxx
@@ -29,7 +29,7 @@
 
 ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 						 const UPnPService &service)
-	:m_actionURL(uri_apply_base(device.URLBase, service.controlURL)),
+	:m_actionURL(uri_apply_base(service.controlURL, device.URLBase)),
 	 m_serviceType(service.serviceType),
 	 m_deviceId(device.UDN),
 	 m_friendlyName(device.friendlyName),