diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 86a5805..b3c8ead 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= daa077f45d06c001ccee098c13acaf8df6d4bdce
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 8feb62b8d22be7881355e8cf44de0f11e9b28fae
 
 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/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index a409b46..c1c1a15 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -30,7 +30,8 @@
 endef
 
 define HOST_LIBFLASH_BUILD_CMDS
-    $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/external/pflash
+    $(HOST_MAKE_ENV) SKIBOOT_VERSION=$(LIBFLASH_VERSION) \
+	    $(MAKE) -C $(@D)/external/pflash
 endef
 
 define LIBFLASH_INSTALL_STAGING_CMDS