diff --git a/diskimage_builder/elements/dib-init-system/dib-init-system b/diskimage_builder/elements/dib-init-system/dib-init-system
index e5213dc26..f07bc8e0f 100755
--- a/diskimage_builder/elements/dib-init-system/dib-init-system
+++ b/diskimage_builder/elements/dib-init-system/dib-init-system
@@ -6,7 +6,10 @@ fi
 set -eu
 set -o pipefail
 
-if [[ -f /usr/bin/systemctl ]]; then
+# Debian Jessie and Debian Stretch use /bin/systemctl.
+# (/sbin/init is only available if systemd-sysv is installed.)
+
+if [ -f /usr/bin/systemctl -o -f /bin/systemctl ]; then
     echo "systemd"
 elif [[ -f /sbin/initctl ]]; then
     echo "upstart"
diff --git a/releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml b/releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml
new file mode 100644
index 000000000..ec663a984
--- /dev/null
+++ b/releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - dib-init-system did not correctly find the
+    init system for Debian Jessie and Debian Stretch.
+    This version also looks for /bin/systemctl as
+    as hint for systemd and fixes the problem.