diff --git a/debian/changelog b/debian/changelog
index a7d2a88..08b58c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nut (2.6.4-3) UNRELEASED; urgency=low
+
+  * debian/rules: Stop the nut-client before nut-server on systems using static
+    boot ordering (Closes: #679451)
+
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 09 Aug 2012 10:31:05 +0200
+
 nut (2.6.4-2) unstable; urgency=low
 
   * debian/control, debian/nut-ipmi.{install,manpages}: create IPMI
diff --git a/debian/rules b/debian/rules
index b9eef15..b0745bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,8 @@ common-install-indep::
 binary-install/nut-monitor::
 	dh_python2 -pnut-monitor
 
-DEB_DH_INSTALLINIT_ARGS_nut-server := --init-script=nut-server -- start 50 2 3 4 5 . stop 50 0 1 6 .
-DEB_DH_INSTALLINIT_ARGS_nut-client := --init-script=nut-client -- start 51 2 3 4 5 . stop 51 0 1 6 .
+DEB_DH_INSTALLINIT_ARGS_nut-server := --init-script=nut-server -- start 50 2 3 4 5 . stop 51 0 1 6 .
+DEB_DH_INSTALLINIT_ARGS_nut-client := --init-script=nut-client -- start 51 2 3 4 5 . stop 50 0 1 6 .
 DEB_DH_COMPRESS_ARGS_nut-doc := -X.pdf
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))