diff --git a/debian-stretch/control b/debian-stretch/control
deleted file mode 100644
index 7e68101c4..000000000
--- a/debian-stretch/control
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: dump1090-fa
-Section: embedded
-Priority: extra
-Maintainer: Oliver Jowett <oliver.jowett@flightaware.com>
-Build-Depends: debhelper(>=10), librtlsdr-dev, libusb-1.0-0-dev, pkg-config, libncurses5-dev, libbladerf-dev
-Standards-Version: 3.9.3
-Homepage: http://www.flightaware.com/
-Vcs-Git: https://github.com/flightaware/dump1090.git
-
-Package: dump1090
-Architecture: all
-Depends: dump1090-fa, ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: transitional dummy package for dump1090
-  This is a transitional dummy package to handle upgrades from
-  the old package name of "dump1090" to the new package name of
-  "dump1090-fa". It can safely be removed.
-
-Package: dump1090-fa
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libbladerf1 (>= 0.2016.06), adduser, lighttpd
-Replaces: dump1090 (<< 3.0)
-Breaks: dump1090 (<< 3.0)
-Description: ADS-B Ground Station System for RTL-SDR
- Networked Aviation Mode S / ADS-B decoder/translator with RTL-SDR software
- defined radio USB device support.
- .
- This is FlightAware's fork of dump1090-mutability, customized for use
- in the PiAware sdcard images.
diff --git a/debian-stretch/rules b/debian-stretch/rules
deleted file mode 100755
index 11c7581f3..000000000
--- a/debian-stretch/rules
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-override_dh_auto_build:
-	# starch's gcc doesn't support the compiler flags needed for ARM-specific starch flavors;
-	# turn off runtime CPU detection
-	dh_auto_build -- RTLSDR=yes BLADERF=yes HACKRF=no LIMESDR=no DUMP1090_VERSION=$(DEB_VERSION) CPUFEATURES=no
-
-override_dh_install:
-	dh_install
-	install -d debian/dump1090-fa/usr/bin
-	cp -a dump1090 debian/dump1090-fa/usr/bin/dump1090-fa
-	cp -a view1090 debian/dump1090-fa/usr/bin/view1090-fa
-
-override_dh_installinit:
-	dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade
-
-override_dh_systemd_start:
-	dh_systemd_start --no-stop-on-upgrade --no-restart-after-upgrade --name=dump1090-fa.service
-
-%:
-	dh $@ --with=systemd
diff --git a/debian/compat b/debian/compat
index f599e28b8..48082f72f 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/debian/control b/debian/control
index e89a0070a..1acb92e86 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dump1090-fa
 Section: embedded
 Priority: extra
 Maintainer: Oliver Jowett <oliver.jowett@flightaware.com>
-Build-Depends: debhelper(>=10),
+Build-Depends: debhelper(>=12),
   librtlsdr-dev <!custom> <rtlsdr>,
   libbladerf-dev <!custom> <bladerf>,
   libhackrf-dev <!custom> <hackrf>,
@@ -16,6 +16,7 @@ Vcs-Git: https://github.com/flightaware/dump1090.git
 
 Package: dump1090-fa
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lighttpd
 Description: FlightAware ADS-B Ground Station System for SDRs
  Networked Aviation Mode S / ADS-B decoder/translator with support
diff --git a/debian/rules b/debian/rules
index 5e32dcf44..6f042e301 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,8 @@ override_dh_install:
 override_dh_installinit:
 	dh_installinit --no-restart-after-upgrade
 
-override_dh_systemd_start:
-	dh_systemd_start --no-restart-after-upgrade
+override_dh_installsystemd:
+	dh_installsystemd --no-restart-after-upgrade
 
 %:
-	dh $@ --with=systemd
+	dh $@
diff --git a/prepare-build.sh b/prepare-build.sh
index adb72623c..282f82de5 100755
--- a/prepare-build.sh
+++ b/prepare-build.sh
@@ -38,11 +38,6 @@ cp -a $TOP/debian $OUT
 [ -d $TOP/debian-$DIST ] && cp -a $TOP/debian-$DIST/* $OUT/debian/
 
 case "$DIST" in
-    stretch)
-        echo "Updating changelog for stretch backport build" >&2
-        dch --changelog $OUT/debian/changelog --local ~bpo9+ --force-distribution --distribution stretch-backports "Automated backport build for jessie"
-        ;;
-
     buster)
         echo "Updating changelog for buster backport build" >&2
         dch --changelog $OUT/debian/changelog --local ~bpo10+ --force-distribution --distribution buster-backports "Automated backport build for buster"