diff --git a/800.renames-and-merges/k.yaml b/800.renames-and-merges/k.yaml
index 4df9d426a..8daba9bdb 100644
--- a/800.renames-and-merges/k.yaml
+++ b/800.renames-and-merges/k.yaml
@@ -60,6 +60,7 @@
 - { setname: kitscenarist,             name: scenarist } # XXX: problem
 - { setname: kiwi,                     name: "python:kiwi" } # totally intermixed, split in 850
 - { setname: kiwix-desktop,            name: kiwix }
+- { setname: klaus,                    name: python:$0 }
 - { setname: klotski,                  name: gnome-games-klotski }
 - { setname: kmldonkey,                name: kde4-kmldonkey }
 - { setname: kmon,                     name: "rust:kmon" }
diff --git a/850.split-ambiguities/k.yaml b/850.split-ambiguities/k.yaml
index 6d8e8b4f1..c9317bea9 100644
--- a/850.split-ambiguities/k.yaml
+++ b/850.split-ambiguities/k.yaml
@@ -66,6 +66,10 @@
 - { name: kiwi, wwwpart: [suse,osinside,pypi.org/project/kiwi/], setname: kiwi-appliance-builder }
 - { name: kiwi, addflag: unclassified }
 
+- { name: klaus, wwwpart: kLausqt, setname: klausqt } # XXX: problem
+- { name: klaus, wwwpart: jonashaag, setname: klaus-git-web-viewer }
+- { name: klaus, addflag: unclassified }
+
 - { name: knights, wwwpart: knightsgame.org.uk, setname: knightsgame }
 
 - { name: knock, wwwpart: guelfoweb, setname: knockpy }