diff --git a/common/recipes-bsp/iicmaster/iicmaster.bb b/common/recipes-bsp/iicmaster/iicmaster.bb
new file mode 100644
index 0000000..00e0feb
--- /dev/null
+++ b/common/recipes-bsp/iicmaster/iicmaster.bb
@@ -0,0 +1,16 @@
+SUMMARY     = "I2C debug tool"
+DESCRIPTION = "iicmaster provides a debug interface for remote, FSI-based I2C engines"
+LICENSE     = "GPLv3"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
+
+SRC_URI += "git://github.com/eddiejames/iicmaster.git"
+
+SRCREV = "b71dbf99af495a631dc5f3564296903667bc516c"
+PV = "git${SRCREV}"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 iicmaster ${D}${bindir}
+}
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 8ede231..df24c6c 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,5 +1,11 @@
 RDEPENDS_${PN}-extrasdev += "obmc-pydevtools"
 
+# Add the iicmaster debug tool to p9 systems. iicmaster is for fsi-based i2c
+# engines. This is a temporary addition until proper kernel i2c driver is in
+# place. Use p9-vcs-workaround to restrict iicmaster installtion to p9 systems
+# that use openfsi
+RDEPENDS_${PN}-extrasdev += "${@mf_enabled(d, 'p9-vcs-workaround', 'iicmaster')}"
+
 # Add the deprecated /org/openbmc inventory namespace providing
 # obmc-mgr-inventory application to the inventory packagegroup
 # until all applications have been updated to use the new,