diff -Nru nmap-6.47/debian/changelog nmap-6.47/debian/changelog
--- nmap-6.47/debian/changelog	2015-06-25 16:03:41.000000000 +0000
+++ nmap-6.47/debian/changelog	2015-06-28 10:42:45.000000000 +0000
@@ -1,3 +1,10 @@
+nmap (6.47-7) unstable; urgency=medium
+
+  * Replaced versioned Conflicts with Breaks/Replaces (Closes: #789897).
+    Thanks to Michael Biebl for pointing this out.
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 28 Jun 2015 12:42:32 +0200
+
 nmap (6.47-6) unstable; urgency=medium
 
   * ndiff: Added versioned Conflicts (Closes: #789897)
diff -Nru nmap-6.47/debian/control nmap-6.47/debian/control
--- nmap-6.47/debian/control	2015-06-25 16:03:10.000000000 +0000
+++ nmap-6.47/debian/control	2015-06-28 10:40:29.000000000 +0000
@@ -54,7 +54,9 @@
 Package: ndiff
 Architecture: all
 Recommends: nmap
-Conflicts: nmap (<< ${source:Version}), zenmap (<< 6.47-5~)
+Conflicts: nmap (<< ${source:Version})
+Breaks: zenmap (<< 6.47-5~)
+Replaces: zenmap (<< 6.47-5~)
 Depends: ${python:Depends}, ${misc:Depends}, python-lxml,
 Description: The Network Mapper - result compare utility
  Ndiff is a tool to aid in the comparison of Nmap scans. It takes two