diff --git a/target_files/meson.build b/target_files/meson.build
index 21059ce..b8f511c 100644
--- a/target_files/meson.build
+++ b/target_files/meson.build
@@ -9,6 +9,7 @@
     'obmc-fan-watchdog-takeover.target',
     'obmc-fans-ready.target',
     'obmc-host-crash@.target',
+    'obmc-host-diagnostic-mode@.target',
     'obmc-host-force-warm-reboot@.target',
     'obmc-host-quiesce@.target',
     'obmc-host-reboot@.target',
diff --git a/target_files/obmc-host-diagnostic-mode@.target b/target_files/obmc-host-diagnostic-mode@.target
new file mode 100644
index 0000000..27f07b6
--- /dev/null
+++ b/target_files/obmc-host-diagnostic-mode@.target
@@ -0,0 +1,9 @@
+[Unit]
+# This target is activated when the host is
+# collecting debug data which can be used to
+# debug a user or self detected error in the host
+Description=Diagnostic Mode Collection for Host%i
+Wants=multi-user.target
+After=multi-user.target
+Conflicts=obmc-host-startmin@%i.target
+RefuseManualStop=yes