diff --git a/debian/control b/debian/control
index f6b838d..713fe22 100644
--- a/debian/control
+++ b/debian/control
@@ -46,9 +46,9 @@ Architecture: any
 Depends: adduser,
          lsb-base (>= 3.0-6),
          nut-client (= ${binary:Version}),
+         udev [linux-any],
          ${misc:Depends},
-         ${shlibs:Depends},
-         udev [linux-any]
+         ${shlibs:Depends}
 Suggests: nut-cgi, nut-ipmi, nut-snmp, nut-xml
 Pre-Depends: ${misc:Pre-Depends}
 Description: network UPS tools - core system
@@ -185,8 +185,8 @@ Description: network UPS tools - client library
 Package: libupsclient-dev
 Section: libdevel
 Architecture: any
-Depends: libupsclient4 (= ${binary:Version}),
-         libnss3-dev,
+Depends: libnss3-dev,
+         libupsclient4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Multi-Arch: same
@@ -233,7 +233,7 @@ Description: network UPS tools - development files for the new client library
 Package: libnutscan1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: network UPS tools - scanner library
@@ -248,7 +248,7 @@ Description: network UPS tools - scanner library
 Package: libnutscan-dev
 Section: libdevel
 Architecture: any
-Depends: libnutscan1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libnutscan1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libupsclient-dev (<< 2.7.4-9~)
 Replaces: libupsclient-dev (<< 2.7.4-9~)
 Multi-Arch: same
diff --git a/debian/libnutscan-dev.install b/debian/libnutscan-dev.install
index 7ec9050..9902dd6 100644
--- a/debian/libnutscan-dev.install
+++ b/debian/libnutscan-dev.install
@@ -1,6 +1,6 @@
-usr/lib/*/libnutscan.so
-usr/lib/*/pkgconfig/libnutscan.pc
 usr/include/nut-scan.h
-usr/include/nutscan-ip.h
 usr/include/nutscan-device.h
 usr/include/nutscan-init.h
+usr/include/nutscan-ip.h
+usr/lib/*/libnutscan.so
+usr/lib/*/pkgconfig/libnutscan.pc
diff --git a/debian/nut-client.install b/debian/nut-client.install
index 318c1e8..dd7cc04 100644
--- a/debian/nut-client.install
+++ b/debian/nut-client.install
@@ -7,6 +7,9 @@ debian/tmp/etc/nut/nut.conf
 debian/tmp/etc/nut/upsmon.conf
 debian/tmp/etc/nut/upssched.conf
 debian/tmp/lib/nut/upsmon
+debian/tmp/lib/systemd/system/nut-client.service
+debian/tmp/lib/systemd/system/nut-monitor.service
+debian/tmp/lib/systemd/system/ups-monitor.service
 debian/tmp/sbin/upsmon
 debian/tmp/sbin/upssched
 debian/tmp/usr/share/augeas/lenses/nuthostsconf.aug
@@ -19,6 +22,3 @@ debian/tmp/usr/share/augeas/lenses/nutupsschedconf.aug
 debian/tmp/usr/share/augeas/lenses/nutupssetconf.aug
 debian/tmp/usr/share/augeas/lenses/tests/test_nut.aug
 debian/tmp/usr/share/bash-completion/completions/nut
-debian/tmp/lib/systemd/system/nut-monitor.service
-debian/tmp/lib/systemd/system/nut-client.service
-debian/tmp/lib/systemd/system/ups-monitor.service
diff --git a/debian/nut-server.install b/debian/nut-server.install
index 25864f2..367bad1 100644
--- a/debian/nut-server.install
+++ b/debian/nut-server.install
@@ -1,4 +1,5 @@
 debian/tmp/*/udev/rules.d/62-nut-usbups.rules
+debian/tmp/bin/nut-scanner
 debian/tmp/etc/avahi/services/nut.service
 debian/tmp/etc/nut/ups.conf
 debian/tmp/etc/nut/upsd.conf
@@ -53,11 +54,10 @@ debian/tmp/lib/nut/upscode2
 debian/tmp/lib/nut/upsd
 debian/tmp/lib/nut/usbhid-ups
 debian/tmp/lib/nut/victronups
+debian/tmp/lib/systemd/system-shutdown/nutshutdown
+debian/tmp/lib/systemd/system/nut-driver.service
+debian/tmp/lib/systemd/system/nut-server.service
 debian/tmp/sbin/upsd
 debian/tmp/sbin/upsdrvctl
 debian/tmp/usr/share/nut/cmdvartab
 debian/tmp/usr/share/nut/driver.list
-debian/tmp/bin/nut-scanner
-debian/tmp/lib/systemd/system-shutdown/nutshutdown
-debian/tmp/lib/systemd/system/nut-driver.service
-debian/tmp/lib/systemd/system/nut-server.service
diff --git a/debian/tests/control b/debian/tests/control
index afb27ff..fc0a7ad 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: nut
-Depends: nut-server, nut-client, python, lsb-release, netcat, psmisc
+Depends: lsb-release, netcat, nut-client, nut-server, psmisc, python
 Restrictions: needs-root