diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index de9b9ad..f03890b 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,8 @@
 # hostboot
 #
 ################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 7fdfb37ecb5454f66ed24e6db929a1e0eebad245
-HOSTBOOT_VERSION_BRANCH_MASTER ?= d806c5637618ffc9f4e7cacd6f2cb3967101380c
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 09cfacbaf1cd18da4e6e9072afcc8db28ca56ffe
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 41a7ef20f6aaf52c3939bde7d5ad9adc86514fc0
 
 HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0003-fix-makefile-comment.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-fix-makefile-comment.patch
deleted file mode 100644
index 0332e12..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0003-fix-makefile-comment.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9f70b09d7df45c22183035370e09a6bd87753dd3 Mon Sep 17 00:00:00 2001
-From: Elizabeth Liner <eliner@us.ibm.com>
-Date: Mon, 14 Nov 2016 17:07:50 -0600
-Subject: [PATCH] Makefile changes for OP Build CI Witherspoon
-
-Change-Id: Id51c5333c10e910f54d9f2fb5666ed5701efbfc0
----
-
-diff --git a/src/usr/testcore/lib/makefile b/src/usr/testcore/lib/makefile
-index 9866637..a688b2a 100644
---- a/src/usr/testcore/lib/makefile
-+++ b/src/usr/testcore/lib/makefile
-@@ -25,8 +25,8 @@
- ROOTPATH = ../../../..
- 
- MODULE = testsyslib
--//  @TODO-RTC:151185-Turn enable all test cases
--// TESTS = *.H
-+#@TODO-RTC:151185-Turn enable all test cases
-+#TESTS = *.H
- TESTS = stltest.H
- 
- 
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 9303639..d10c0f5 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OCC_VERSION_BRANCH_MASTER_P8 ?= 72544469d2e83fca6d7ef20a01661a6710077c3b
+OCC_VERSION_BRANCH_MASTER_P8 ?= d7efe30d9bee683578c31171af28baf8251ced4e
 OCC_VERSION_BRANCH_MASTER ?= a4e04571d60b58c0c778c870bc215bf467085fb6
 
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))