diff --git a/.gitignore b/.gitignore
index e61f1cdbad..01fba83563 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/systemd-delta
 /systemd-sleep
 /systemd-inhibit
 /systemd-remount-fs
diff --git a/Makefile.am b/Makefile.am
index 7c1b431093..7d6d744ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -214,7 +214,8 @@ bin_PROGRAMS = \
 	systemd-cgtop \
 	systemd-stdio-bridge \
 	systemd-nspawn \
-	systemd-detect-virt
+	systemd-detect-virt \
+	systemd-delta
 
 dist_bin_SCRIPTS = \
 	src/analyze/systemd-analyze
@@ -452,6 +453,7 @@ MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
 	man/systemd-cgls.1 \
+	man/systemd-delta.1 \
 	man/systemd-cgtop.1 \
 	man/systemd-nspawn.1 \
 	man/systemd-tmpfiles.8 \
@@ -1114,6 +1116,13 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+	src/delta/delta.c
+
+systemd_delta_LDADD = \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
 	src/getty-generator/getty-generator.c
diff --git a/TODO b/TODO
index 5d18a64b17..d1756d89a6 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,10 @@ Bugfixes:
 
 Features:
 
+* (attempt to) make Debianites happy:
+        - implement .d/ auto includes for unit files
+        - add syntax to reset ExecStart= lists (and similar)
+
 * actually queue the new default unit after switch-root
 
 * remove old root in switch-root logic