diff --git a/openpower/package/ocmb-explorer-fw/Config.in b/openpower/package/ocmb-explorer-fw/Config.in
index 298855d..4dcc4df 100644
--- a/openpower/package/ocmb-explorer-fw/Config.in
+++ b/openpower/package/ocmb-explorer-fw/Config.in
@@ -1,35 +1,21 @@
 config BR2_PACKAGE_OCMB_EXPLORER_FW
-        bool "ocmb_explorer_fw"
+        bool "ocmb-explorer-fw"
         default n
         help
             Project to stage ocmb explorer fw and binary image releases
 
 if BR2_PACKAGE_OCMB_EXPLORER_FW
 
-choice
-	prompt "OCMB Explorer Binary version"
-	default BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-
-config BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-	bool "Use latest OCMB_EXPLORER_FW master"
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
-	bool "Custom OCMB_EXPLORER_FW version"
-
-endchoice
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE
-	string "Open CAPI Memory Buffer Firmware version"
-	depends on BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
-
 config BR2_OCMB_EXPLORER_FW_VERSION
 	string
-	default "v4.0" if BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-	default BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE \
-		if BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
+	default "v4.0"
 
-config BR2_OCMB_EXPLORER_FW_URL
+config BR2_OCMB_EXPLORER_FW_SITE
         string
-        default "https://github.com/open-power/ocmb-explorer-fw"
+        default "https://github.com/open-power/ocmb-explorer-fw/files/4519502"
+
+config BR2_OCMB_EXPLORER_FW_SOURCE
+        string
+        default "RC4BinaryRelease.zip"
 
 endif
diff --git a/openpower/package/ocmb-explorer-fw/ocmb-explorer-fw.mk b/openpower/package/ocmb-explorer-fw/ocmb-explorer-fw.mk
new file mode 100644
index 0000000..178a3e5
--- /dev/null
+++ b/openpower/package/ocmb-explorer-fw/ocmb-explorer-fw.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# ocmb-explorer-fw
+#
+################################################################################
+
+
+OCMB_EXPLORER_FW_VERSION ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_VERSION))
+OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SOURCE))
+OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SITE))
+
+OCMB_EXPLORER_FW_LICENSE = Apache-2.0
+OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE.pdf
+
+OCMB_EXPLORER_FW_INSTALL_IMAGES = YES
+OCMB_EXPLORER_FW_INSTALL_TARGET = NO
+
+# Commands to extract and install the Open Capi Memory Buffer Firmware (OCMBFW)
+define OCMB_EXPLORER_FW_INSTALL_IMAGES_CMDS
+      $(INSTALL) -D $(@D)/$(call qstrip,$(BR2_OCMBFW_FILENAME)) $(BINARIES_DIR)/
+endef
+
+define OCMB_EXPLORER_FW_EXTRACT_CMDS
+      $(UNZIP) -d $(@D) $(OCMB_EXPLORER_FW_DL_DIR)/$(OCMB_EXPLORER_FW_SOURCE)
+      mv $(@D)/*LICENSE*.pdf $(@D)/LICENSE.pdf
+endef
+
+$(eval $(generic-package))
diff --git a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
deleted file mode 100644
index 9aa4eb1..0000000
--- a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#
-# ocmb-explorer-fw
-#
-################################################################################
-
-
-OCMB_EXPLORER_FW_VERSION ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_VERSION))
-OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMBFW_FILENAME))
-OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_URL))/releases/download/$(BR2_OCMB_EXPLORER_FW_VERSION)
-
-OCMB_EXPLORER_FW_LICENSE = Apache-2.0
-OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE
-
-OCMB_EXPLORER_FW_INSTALL_IMAGES = YES
-OCMB_EXPLORER_FW_INSTALL_TARGET = NO
-
-# Commands to extract and install the Open Capi Memory Buffer Firmware (OCMBFW)
-define OCMB_EXPLORER_FW_INSTALL_IMAGES_CMDS
-      $(INSTALL) -D $(@D)/$(OCMB_EXPLORER_FW_SOURCE) $(BINARIES_DIR)/
-endef
-
-define OCMB_EXPLORER_FW_EXTRACT_CMDS
-      cp $(DL_DIR)/ocmb-explorer-fw/$(OCMB_EXPLORER_FW_SOURCE) $(@D)/
-endef
-
-$(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 9d46006..91d877c 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -106,6 +106,10 @@
     OCC_BIN_FILENAME=$(BR2_OCC_BIN_FILENAME)
 endif
 
+ifeq ($(BR2_PACKAGE_OCMB_EXPLORER_FW),y)
+    OCMB_EXPLORER_FW_URL=$(call qstrip,$(OCMB_EXPLORER_FW_SITE)/$(OCMB_EXPLORER_FW_SOURCE))
+endif
+
 define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS
         mkdir -p $(OPENPOWER_PNOR_SCRATCH_DIR)
 
@@ -137,7 +141,7 @@
             -binary_dir $(BINARIES_DIR) \
             -bootkernel_filename $(LINUX_IMAGE_NAME) \
 	    -ocmbfw_version $(OCMB_EXPLORER_FW_VERSION) \
-	    -ocmbfw_url $(BR2_OCMB_EXPLORER_FW_URL) \
+	    -ocmbfw_url $(OCMB_EXPLORER_FW_URL) \
 	    -ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
 	    -ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
             -pnor_layout $(@D)/"$(OPENPOWER_RELEASE)"Layouts/$(BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME) \