diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000000000000000000000000000000000000..be0e4c16b5f34f02e6e92e4c1f09a0bff9181938
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,3 @@
+[BUILDDEB]
+native = True
+
diff --git a/debian/changelog b/debian/changelog
index 8c9ea885179e899219fc6e7106c8fb6651c3f120..92415036ba44b6cbdf40f4578d802425f9e1bba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+software-properties (0.99.30-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * software-properties-qt: Add Conflicts+Replaces: software-properties-kde
+    for smoother upgrades from bullseye.  (Closes: #1034993)
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 27 Apr 2024 21:08:49 +0200
+
 software-properties (0.99.30-4) unstable; urgency=medium
 
   * py3-software-properties: Depend on lazr.restfulclient (Closes: #1029047)
diff --git a/debian/control b/debian/control
index 94d20bd7622d80269e08c57f232b19659ad3c1ce..790eaae467347ad5d232d3c0af7761e6ee4ff390 100644
--- a/debian/control
+++ b/debian/control
@@ -109,6 +109,8 @@ Depends: debconf-kde-helper,
          ${misc:Depends},
          ${python3:Depends}
 Suggests: plasma-discover
+Conflicts: software-properties-kde
+Replaces: software-properties-kde
 Description: manage the repositories that you install software from (Qt)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software