diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb
new file mode 100644
index 0000000..b6fed55
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/fsidbg/fsidbg.bb
@@ -0,0 +1,18 @@
+SUMMARY     = "FSI debug tool"
+DESCRIPTION = "fsidbg is a tool to access remote FSI engines and perform client driver operations"
+LICENSE     = "GPLv3"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
+
+SRC_URI += "git://github.com/eddiejames/fsidbg.git"
+
+SRCREV = "dfe278065c877724242dfae15a4c627fd2e3611c"
+PV = "git${SRCREV}"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 fsidbg ${D}${bindir}
+}
+
+TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb
deleted file mode 100644
index 2511e45..0000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/iicmaster/iicmaster.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-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}
-}
-
-#TODO: openbmc/openbmc#1362 - Fix GNU_HASH warnings in iic2master
-TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index f794e6a..91c6b03 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,11 +1,5 @@
 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,
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
index e8d656a..f4474e9 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bbappend
@@ -2,4 +2,5 @@
     pflash \
     gard \
     pdbg \
+    fsidbg \
     "