diff --git a/debian/changelog b/debian/changelog
index 1c5d33b6b3f80d5ca0917d0028a395e5ad4e9897..0d2abdd70167a26608677288fb4ac489f8c8e694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gstreamer1.0 (1.18.4-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libgstreamer1.0-dev: Add Conflicts: libgstreamer0.10-dev to ensure the
+    diverted file is gone before the diversion is removed.  (Closes: #990463)
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 29 Jul 2021 16:51:28 +0200
+
 gstreamer1.0 (1.18.4-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index a5954eb27f0af60448682aed3015f5c9d51b2191..90c1e483962dd3b24e21a3c75e94f9cd7707faad 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Depends: libgstreamer1.0-0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends},
          gir1.2-gstreamer-1.0 (= ${binary:Version})
-Conflicts: libgstreamer-plugins-bad1.0-dev (<< 1.13.1)
+Conflicts: libgstreamer-plugins-bad1.0-dev (<< 1.13.1), libgstreamer0.10-dev
 Replaces: libgstreamer-plugins-bad1.0-dev (<< 1.13.1)
 Suggests: gstreamer1.0-doc
 Description: GStreamer core development files