diff --git a/debian/changelog b/debian/changelog
index f66aa84..cc204b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nagios-plugins (1.4.15-7) unstable; urgency=low
+
+  * Recommand nagios-plugins-contrib via nagios-plugins, drop
+    nagios-plugins-common which gets installed by nagios-plugins-basic
+    anyways
+  * Add Replaces: nagios-plugins-basic to nagios-plugins-common
+    (Closes: #673891), thanks to Christoph Anton Mitterer
+
+ -- Jan Wagner <waja@cyconet.org>  Tue, 22 May 2012 20:00:03 +0200
+
 nagios-plugins (1.4.15-6) unstable; urgency=low
 
   * Add nagios-plugins-common package which ships files possibly needed also by
diff --git a/debian/control b/debian/control
index c086ff2..be2a07e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.9.2
 Package: nagios-plugins
 Architecture: all
 Depends: ${misc:Depends}, nagios-plugins-basic, nagios-plugins-standard
-Recommends: nagios-plugins-common
+Recommends: nagios-plugins-contrib
 Suggests: nagios3 | icinga
 Description: Plugins for nagios compatible monitoring systems (metapackage)
  Plugins for nagios compatible monitoring systems like Nagios and Icinga.
@@ -25,7 +25,7 @@ Description: Plugins for nagios compatible monitoring systems (metapackage)
 Package: nagios-plugins-common
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
-Breaks: nagios-plugins-basic (<= 1.4.15-5)
+Replaces: nagios-plugins-basic (<= 1.4.15-5)
 Suggests: nagios3 | icinga
 Description: Common files for plugins for nagios compatible monitoring
  Common files for plugins for nagios compatible monitoring systems like Nagios
@@ -36,7 +36,7 @@ Description: Common files for plugins for nagios compatible monitoring
 Package: nagios-plugins-basic
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
-Pre-Depends: nagios-plugins-common
+Pre-Depends: nagios-plugins-common (>= 1.4.15-6)
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
 Suggests: nagios3 | icinga