diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
new file mode 100644
index 0000000..2a4d670
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Phosphor ipmi tool for injecting ipmi commands"
+DESCRIPTION = "IPMI Tool with dbus capabilities"
+HOMEPAGE = "https://github.com/openbmc/ipmitool"
+PR = "r1"
+
+
+RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+
+inherit obmc-phosphor-license
+
+DEPENDS += "systemd    \
+		 	host-ipmid \
+		 	"
+
+RDEPENDS_${PN} += "libsystemd	\
+                   libcrypto	\
+                   "
+
+
+SRC_URI += "git://github.com/openbmc/ipmitool"
+
+SRCREV = "e9b9c1a9677a3de19726d036cfb07d8d61bbccd8"
+
+
+S = "${WORKDIR}/git"
+
+
+do_compile() {
+	${S}/bootstrap --enable-intf-dbus
+	${S}/configure --host x86_64
+	make
+}
+
+do_install() {  
+	install -m 0755 -d ${D}${sbindir}
+	install -m 0755 ${S}/src/ipmitool ${D}${sbindir}
+}
diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc
index acbfee6..f6fe46d 100644
--- a/meta-phosphor/conf/machine/include/sample.inc
+++ b/meta-phosphor/conf/machine/include/sample.inc
@@ -20,6 +20,7 @@
 VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \
         host-ipmid-oem \
         host-ipmid-fru \
+        host-ipmid-tool \
        "
 PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-hw-example"
 PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd"
diff --git a/yocto-poky/meta/recipes-core/dropbear/dropbear.inc b/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
index a2c736e..9d65020 100644
--- a/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
@@ -17,6 +17,7 @@
            file://0003-configure.patch \
            file://0004-fix-2kb-keys.patch \
            file://0007-dropbear-fix-for-x32-abi.patch \
+           file://0010-stop-robot-test-SSHLibrary-from-hanging.patch \
            file://init \
            file://dropbearkey.service \
            file://dropbear@.service \
diff --git a/yocto-poky/meta/recipes-core/dropbear/dropbear/0010-stop-robot-test-SSHLibrary-from-hanging.patch b/yocto-poky/meta/recipes-core/dropbear/dropbear/0010-stop-robot-test-SSHLibrary-from-hanging.patch
new file mode 100644
index 0000000..851c89f
--- /dev/null
+++ b/yocto-poky/meta/recipes-core/dropbear/dropbear/0010-stop-robot-test-SSHLibrary-from-hanging.patch
@@ -0,0 +1,28 @@
+From aa4ff477eed539085609dc9a8a011ff2f010bd1c Mon Sep 17 00:00:00 2001
+From: Chris Austen <austenc@us.ibm.com>
+Date: Fri, 6 Nov 2015 13:15:54 -0600
+Subject: [PATCH] stop robot test SSHLibrary from hanging
+
+This reverts a change made in this commit
+
+https://github.com/mkj/dropbear/commit/ca86726f9f943b2b18e5694b442d3d2e1c0fa903
+---
+ common-channel.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common-channel.c b/common-channel.c
+index abe5941..5a02d73 100644
+--- a/common-channel.c
++++ b/common-channel.c
+@@ -258,6 +258,8 @@ void channelio(fd_set *readfds, fd_set *writefds) {
+ 			do_check_close = 1;
+ 			ses.channel_signal_pending = 0;
+ 		}
++
++do_check_close = 1;
+ 	
+ 		/* handle any channel closing etc */
+ 		if (do_check_close) {
+-- 
+1.9.1
+