diff -u loadwatch-1.0+1.1alpha1/Makefile.in loadwatch-1.0+1.1alpha1/Makefile.in
--- loadwatch-1.0+1.1alpha1/Makefile.in
+++ loadwatch-1.0+1.1alpha1/Makefile.in
@@ -10,15 +10,17 @@
 
 CC=@CC@
 LIBS=@LIBS@
+CPPFLAGS=@CPPFLAGS@
 CFLAGS=@CFLAGS@
+LDFLAGS=@LDFLAGS@
 
 all: loadwatch lw-ctl
 
 loadwatch: loadwatch.o
-	$(CC) -o $@ $^ $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 lw-ctl: lw-ctl.o
-	$(CC) -o $@ $^ $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
diff -u loadwatch-1.0+1.1alpha1/debian/changelog loadwatch-1.0+1.1alpha1/debian/changelog
--- loadwatch-1.0+1.1alpha1/debian/changelog
+++ loadwatch-1.0+1.1alpha1/debian/changelog
@@ -1,3 +1,18 @@
+loadwatch (1.0+1.1alpha1-6) unstable; urgency=low
+
+  * Switch to debhelper compat level 9. (Closes: #800256)
+  * Use CPPFLAGS and LDFLAGS for compilation.
+  * Use dh_autoreconf, dpkg-architecture and dpkg-buildflags.
+  * Modify configure.in for dh_autoreconf.
+  * Add build-arch and build-indep targets.
+  * Do not ignore failures of the make distclean invocation.
+  * Remove debian/watch file as the upstream website seems to have
+    disappeared. (Closes: #450305, #529126)
+  * Use debhelper’s ${misc:Depends}.
+  * Bump Standards-Version: to 3.9.6.
+
+ -- Nicolas Boullis <nboullis@debian.org>  Sun, 31 Jan 2016 02:32:08 +0100
+
 loadwatch (1.0+1.1alpha1-5) unstable; urgency=low
 
   * Fixed long description thanks to Colin Watson.
diff -u loadwatch-1.0+1.1alpha1/debian/control loadwatch-1.0+1.1alpha1/debian/control
--- loadwatch-1.0+1.1alpha1/debian/control
+++ loadwatch-1.0+1.1alpha1/debian/control
@@ -2,12 +2,12 @@
 Section: utils
 Priority: optional
 Maintainer: Nicolas Boullis <nboullis@debian.org>
-Build-Depends: debhelper (>=3.0.0)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Standards-Version: 3.9.6
 
 Package: loadwatch
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Run a program using only idle cycles
  loadwatch forks a child process and only allows it to run when the
  system load meets user-defined parameters. It allows you to specify
diff -u loadwatch-1.0+1.1alpha1/debian/rules loadwatch-1.0+1.1alpha1/debian/rules
--- loadwatch-1.0+1.1alpha1/debian/rules
+++ loadwatch-1.0+1.1alpha1/debian/rules
@@ -6,20 +6,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-build: build-stamp
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+dpkg_buildflags := dpkg-buildflags
+dpkg_buildflags := DEB_CFLAGS_MAINT_PREPEND="-Wall" $(dpkg_buildflags)
+
+build: build-indep build-arch
+build-indep: 
+build-arch: build-stamp
 build-stamp:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
+	dh_autoreconf
+	./configure $(shell $(dpkg_buildflags) --export=configure) --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 	$(MAKE) 
 	touch build-stamp
 
@@ -27,7 +28,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_autoreconf_clean
 	dh_clean
 
 install: install-stamp
@@ -39,11 +41,11 @@
 	touch install-stamp
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
reverted:
--- loadwatch-1.0+1.1alpha1/debian/watch
+++ loadwatch-1.0+1.1alpha1.orig/debian/watch
@@ -1,5 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-rplay.doit.org	/pub/loadwatch/		loadwatch-*.tgz		debian	uupdate
only in patch2:
unchanged:
--- loadwatch-1.0+1.1alpha1.orig/configure.in
+++ loadwatch-1.0+1.1alpha1/configure.in
@@ -8,7 +8,7 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(elf, elf_begin, [LIBS="$LIBS -lelf"])
-AC_CHECK_LIB(kstat, kstat_open, [AC_DEFINE(HAVE_KSTAT) LIBS="$LIBS -lkstat"])
+AC_CHECK_LIB(kstat, kstat_open, [AC_DEFINE([HAVE_KSTAT], [], [Define if kstat library exists.]) LIBS="$LIBS -lkstat"])
 
 dnl Checks for header files.
 AC_HEADER_STDC
only in patch2:
unchanged:
--- loadwatch-1.0+1.1alpha1.orig/debian/compat
+++ loadwatch-1.0+1.1alpha1/debian/compat
@@ -0,0 +1 @@
+9