diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index b818174..69a3510 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -7,6 +7,32 @@
 
 if BR2_PACKAGE_HOSTBOOT
 
+choice
+	prompt "Hostboot version"
+	default BR2_HOSTBOOT_OP920_VERSION
+
+config BR2_HOSTBOOT_OP920_VERSION
+	bool "Use latest Hostboot stable version (OP920)"
+
+config BR2_HOSTBOOT_LATEST_VERSION
+	bool "Use latest Hostboot master"
+
+config BR2_HOSTBOOT_CUSTOM_VERSION
+	bool "Custom version"
+
+endchoice
+
+config BR2_HOSTBOOT_CUSTOM_VERSION_VALUE
+	string "hostboot version"
+	depends on BR2_HOSTBOOT_CUSTOM_VERSION
+
+config BR2_HOSTBOOT_VERSION
+	string
+	default "c38615a583b7f19c0ae6a5a152b575fe61ff3d2a" if BR2_HOSTBOOT_LATEST_VERSION
+	default "4b25a2be9395e4d287c94a1900ae54823efd477c" if BR2_HOSTBOOT_OP920_VERSION
+	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
+		if BR2_HOSTBOOT_CUSTOM_VERSION
+
 config BR2_HOSTBOOT_CONFIG_FILE
         string "Hostboot configuration file for compilation"
         default default
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index cb98e32..1bfe016 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_VERSION ?= c38615a583b7f19c0ae6a5a152b575fe61ff3d2a
+HOSTBOOT_VERSION = $(call qstrip,$(BR2_HOSTBOOT_VERSION))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0