diff --git a/openpower/package/hostboot/hostboot-0005-Watchdog-timer-increase-to-7-minutes.patch b/openpower/package/hostboot/hostboot-0005-Watchdog-timer-increase-to-7-minutes.patch
new file mode 100644
index 0000000..321a067
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0005-Watchdog-timer-increase-to-7-minutes.patch
@@ -0,0 +1,36 @@
+From 55b61605f1a58885e77d6737bfe36f957417a991 Mon Sep 17 00:00:00 2001
+From: Andrew Geissler <andrewg@us.ibm.com>
+Date: Wed, 25 Feb 2015 13:09:48 -0600
+Subject: [PATCH 1/2] Increase watchdog timout to 7.5 minutes
+
+Change-Id: I46070784c303e8135075bc5d36e17a2593ee494c
+RTC: 124676
+---
+ src/include/usr/ipmi/ipmiwatchdog.H |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/usr/ipmi/ipmiwatchdog.H b/src/include/usr/ipmi/ipmiwatchdog.H
+index f23b771..2296cc4 100644
+--- a/src/include/usr/ipmi/ipmiwatchdog.H
++++ b/src/include/usr/ipmi/ipmiwatchdog.H
+@@ -43,12 +43,15 @@ namespace IPMIWATCHDOG
+ // Globals/Constants
+ /******************************************************************************/
+ /**
+- * @brief the default watchdog countdown setting it to 120 seconds.
++ * @brief the default watchdog countdown setting it to 450 seconds.a
++ *
++ * Total time on 16x16GB on Habanero was 170s so double and add
++ * some padding for max config 32 way Habanero.
+  *
+  * @TODO RTC:124499 revisit after performace improvments
+  *
+  */
+-const uint16_t  DEFAULT_WATCHDOG_COUNTDOWN = 120;
++const uint16_t  DEFAULT_WATCHDOG_COUNTDOWN = 450;
+ 
+ /**
+  * @brief the default watchdog countdown for transition between hostboot
+-- 
+1.7.4.1
+
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 7e1af21..99de01f 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_VERSION ?= 7894fc7b2f7e848267b4f3666f5d8410ea9b894a
+HOSTBOOT_VERSION ?= 84a672bd28630d9998fc2808df3659ddcf5a7eda
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0