diff -Nru arpwatch-2.1a15/debian/arpwatch.service arpwatch-2.1a15/debian/arpwatch.service
--- arpwatch-2.1a15/debian/arpwatch.service	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/arpwatch.service	2018-01-08 20:40:49.000000000 +0000
@@ -9,7 +9,6 @@
 
 [Unit]
 Description=arpwatch service
-After=network.target
 Documentation=man:arpwatch(8)
 
 [Service]
diff -Nru arpwatch-2.1a15/debian/arpwatch@.service arpwatch-2.1a15/debian/arpwatch@.service
--- arpwatch-2.1a15/debian/arpwatch@.service	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/arpwatch@.service	2018-01-08 20:40:49.000000000 +0000
@@ -1,7 +1,9 @@
 [Unit]
 Description=arpwatch service on interface %I
-PartOf=arpwatch.service
 Documentation=man:arpwatch(8)
+PartOf=arpwatch.service
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 PrivateTmp=true
diff -Nru arpwatch-2.1a15/debian/changelog arpwatch-2.1a15/debian/changelog
--- arpwatch-2.1a15/debian/changelog	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/changelog	2018-01-08 20:40:49.000000000 +0000
@@ -1,3 +1,14 @@
+arpwatch (2.1a15-6) unstable; urgency=medium
+
+  * Remove the autotools-dev dh addon (no longer needed in debhelper 10).
+  * Ensure arpwatch is started after network interfaces have been configured
+    since it wants to read their configuration. (Closes: 886635)
+  * Bump Standards-Version to 4.1.3 (no change needed).
+  * Remove trailing whitespaces in debian/changelog.
+  * Update to debhelper compatibility level 11.
+
+ -- Lukas Schwaighofer <lukas@schwaighofer.name>  Mon, 08 Jan 2018 21:40:49 +0100
+
 arpwatch (2.1a15-5) unstable; urgency=medium
 
   * fix typo in debian/NEWS release name
@@ -249,7 +260,7 @@
     (Closes: #256381)
     [patch 023_arpfetch]
   * Added the -u flag to run arpwatch with lower privileges as suggested
-    by Den Gaudet and with a patch based on RedHat's. Also, the 
+    by Den Gaudet and with a patch based on RedHat's. Also, the
     'arpwatch' user is created on postinst and used by the init
     script (Closes: #217488)
     [patch 024_username]
@@ -258,7 +269,7 @@
     and Compaq MAC addresses (Closes: #227375)
   * Changed the sample lines of the configuration file to just 'root'
     instead of 'root+ethX@example.com' (Closes: #197138)
-  * Create an empty arp.dat file at /var/lib/arpwatch/ if it does not 
+  * Create an empty arp.dat file at /var/lib/arpwatch/ if it does not
     exist when running 'start_default()' in the init script. This will
     make arpwatch work even if you have not customised arpwatch.conf or
     the preinst fails to create that file.
diff -Nru arpwatch-2.1a15/debian/compat arpwatch-2.1a15/debian/compat
--- arpwatch-2.1a15/debian/compat	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/compat	2018-01-08 20:40:49.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru arpwatch-2.1a15/debian/control arpwatch-2.1a15/debian/control
--- arpwatch-2.1a15/debian/control	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/control	2018-01-08 20:40:49.000000000 +0000
@@ -3,22 +3,24 @@
 Priority: optional
 Maintainer: Debian Security Tools Packaging Team <pkg-security-team@lists.alioth.debian.org>
 Uploaders: Lukas Schwaighofer <lukas@schwaighofer.name>
-Build-Depends: autotools-dev,
-               debhelper (>= 10),
-               libpcap0.8-dev
-Standards-Version: 4.0.0
+Build-Depends:
+ debhelper (>= 11),
+ libpcap0.8-dev,
+Standards-Version: 4.1.3
 Homepage: http://ee.lbl.gov/
 Vcs-Git: https://anonscm.debian.org/git/pkg-security/arpwatch.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-security/arpwatch.git
 
 Package: arpwatch
 Architecture: any
-Depends: adduser,
-         gawk,
-         lsb-base,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: ieee-data (>=20160613.1)
+Depends:
+ adduser,
+ gawk,
+ lsb-base,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ ieee-data (>=20160613.1),
 Description: Ethernet/FDDI station activity monitor
  Arpwatch maintains a database of Ethernet MAC addresses seen on the
  network, with their associated IP pairs.  Alerts the system administrator
diff -Nru arpwatch-2.1a15/debian/rules arpwatch-2.1a15/debian/rules
--- arpwatch-2.1a15/debian/rules	2017-07-21 19:01:33.000000000 +0000
+++ arpwatch-2.1a15/debian/rules	2018-01-08 20:40:49.000000000 +0000
@@ -7,4 +7,4 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autotools-dev
+	dh $@