diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb
new file mode 100644
index 0000000..ec4d429
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb
@@ -0,0 +1,28 @@
+SUMMARY = "OpenPOWER Debug Collector"
+DESCRIPTION = "Application to log error during host checkstop"
+
+PR = "r1"
+
+inherit autotools \
+        pkgconfig \
+        obmc-phosphor-systemd \
+
+require ${PN}.inc
+
+DEPENDS += " \
+        phosphor-logging \
+        autoconf-archive-native \
+        "
+
+RDEPENDS_${PN} += " \
+            phosphor-logging \
+            "
+
+S = "${WORKDIR}/git"
+
+TMPL = "openpower-debug-collector@.service"
+INSTFMT = "openpower-debug-collector@{0}.service"
+LINK_FMT = "${TMPL}:${INSTFMT}"
+
+SYSTEMD_SERVICE_${PN} += "${TMPL}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_CHECKSTOP_INSTANCES')}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.inc
new file mode 100644
index 0000000..099c5cc
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.inc
@@ -0,0 +1,5 @@
+HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+SRC_URI += "git://github.com/openbmc/openpower-debug-collector"
+SRCREV = "a28f2a5be69fb4849b0d35e838f706a8dd6cfcde"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service
new file mode 100644
index 0000000..8f6f2bd
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenPOWER debug data collector
+Conflicts=obmc-host-quiesce@%i.target
+
+[Service]
+ExecStart={sbindir}/checkstop_app
+Type=oneshot
+Restart=no