diff --git a/800.renames-and-merges/p.yaml b/800.renames-and-merges/p.yaml
index ab3fc0021..1b249142e 100644
--- a/800.renames-and-merges/p.yaml
+++ b/800.renames-and-merges/p.yaml
@@ -15,7 +15,7 @@
 - { setname: padthv1,                  name: padthv1-lv2 }
 - { setname: pagmo,                    name: pagmo2 }
 - { setname: pagmo,                    name: "python:pygmo", addflavor: pygmo }
-- { setname: paho.mqtt.c,              name: [paho,paho-c,paho-mqtt-c] }
+- { setname: paho.mqtt.c,              name: [paho,paho-c,paho-mqtt-c,libpaho-mqtt3] }
 - { setname: paho.mqtt.cpp,            name: [paho-mqtt-cpp,paho-mqttpp3] }
 - { setname: paint.net,                name: paintdotnet }
 - { setname: paintown,                 name: paintown-data, addflavor: true }
diff --git a/850.split-ambiguities/p.yaml b/850.split-ambiguities/p.yaml
index 632774b68..0ff22d7c2 100644
--- a/850.split-ambiguities/p.yaml
+++ b/850.split-ambiguities/p.yaml
@@ -29,6 +29,10 @@
 - { name: pacman, wwwpart: archlinux, setname: pacman-package-manager }
 - { name: pacman, addflag: unclassified }
 
+- { name: paho-mqtt, wwwpart: paho.mqtt.c, setname: paho.mqtt.c } # XXX: problem
+# also unprefixed python module
+- { name: paho-mqtt, addflag: unclassified }
+
 - { name: pal, wwwpart: palcal, setname: palcal }
 - { name: pal, wwwpart: starlink, setname: pal-astronomical }
 - { name: pal, ruleset: cygwin, setname: palcal }