diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 8d60427..1b77a56 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw100618a.930" if BR2_HCODE_LATEST_VERSION
+	default "hw100918a.930" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk
index 73401d6..fb3901d 100644
--- a/openpower/package/hostboot-p8/hostboot-p8.mk
+++ b/openpower/package/hostboot-p8/hostboot-p8.mk
@@ -3,7 +3,7 @@
 # hostboot for POWER8
 #
 ################################################################################
-HOSTBOOT_P8_VERSION ?= 30b88edd16abf46481dbab0a46809dbefed40225
+HOSTBOOT_P8_VERSION ?= 335b7ca02e5bd58fbd8cac6b3133a260327cd6b4
 
 HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION))
 
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index bb54c72..5349272 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -28,7 +28,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "31b6cf0ac237a0365bcf225fc0e8ae20c7012b87" if BR2_HOSTBOOT_LATEST_VERSION
+	default "52f52bb84c856d71466ee19acdd8943565be39cc" if BR2_HOSTBOOT_LATEST_VERSION
         default "876b79aacd9b14f4c3561e954daa0285747c9662" if BR2_HOSTBOOT_STABLE_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION