diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 0e4b766..d72cb81 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -21,6 +21,7 @@
 
 BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
 BR2_OPENPOWER_PNOR_FILENAME="firestone.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="firestone_update.pnor"
 
 # skiboot requirements
 BR2_TARGET_SKIBOOT=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 2d400c0..64b827a 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -21,6 +21,7 @@
 
 BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
 BR2_OPENPOWER_PNOR_FILENAME="habanero.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="habanero_update.pnor"
 
 # skiboot requirements
 BR2_TARGET_SKIBOOT=y
diff --git a/openpower/package/VERSION.readme b/openpower/package/VERSION.readme
index 59fec86..b9b43bb 100644
--- a/openpower/package/VERSION.readme
+++ b/openpower/package/VERSION.readme
@@ -13,12 +13,18 @@
 
     ## Op-build Commands ##
 
-    # Display package version
+    # Display subpackage version
     op-build $(package)-version
 
-    # Force a rebuild of a package version
+    # Display entire pnor version
+    op-build openpower-pnor-version
+
+    # Force a rebuild of a subpackage version
     op-build $(package)-build-version
 
+    # Force a rebuild of all subpackage versions
+    op-build openpower-pnor-build-version-all
+
     ##  Version String (ASCII) ##
 
     General:
diff --git a/openpower/package/capp-ucode/capp-ucode.mk b/openpower/package/capp-ucode/capp-ucode.mk
index 88a9020..fda87ea 100644
--- a/openpower/package/capp-ucode/capp-ucode.mk
+++ b/openpower/package/capp-ucode/capp-ucode.mk
@@ -3,7 +3,7 @@
 # capp-ucode.mk
 #
 ################################################################################
-CAPP_UCODE_VERSION ?= d4b26834dd674b83971d00a8c0952fa5830c8f6a
+CAPP_UCODE_VERSION ?= e4f3923e60979ea42494f590db03d965e478eef1
 CAPP_UCODE_SITE ?= $(call github,open-power,capp-ucode,$(CAPP_UCODE_VERSION))
 PETITBOOT_LICENSE = Apache-2.0
 
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 8815490..6a23e51 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -24,6 +24,11 @@
         help
             String used to define pnor filename to be created
 
+config BR2_OPENPOWER_PNOR_UPDATE_FILENAME
+        string "Name of pnor file to be created for updates, if needed"
+        help
+            String used to define pnor filename to be created for updates, if needed
+
 config BR2_SKIBOOT_LID_NAME
         string "Name of skiboot lid name to be used"
         default "skiboot.lid"
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index d19e95d..fb7e230 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -68,6 +68,13 @@
             -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE)
 
         $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) $(BINARIES_DIR)
+
+        # if this config has an UPDATE_FILENAME defined, create a 32M (1/2 size)
+        # image that only updates the non-golden side
+        if [ "$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME)" != "" ]; then \
+            dd if=$(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) of=$(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME) bs=32M count=1; \
+            $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME) $(BINARIES_DIR); \
+        fi
 endef
 
 $(eval $(generic-package))
diff --git a/openpower/package/pkg-versions.mk b/openpower/package/pkg-versions.mk
index 3ac8c9f..e3acbda 100644
--- a/openpower/package/pkg-versions.mk
+++ b/openpower/package/pkg-versions.mk
@@ -184,7 +184,6 @@
 		@cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
 		@echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
 
-
 # Rule to generate pnor version
 $(1)-build-version: $$(foreach pkg,$$(OPENPOWER_VERSIONED_SUBPACKAGES), $$(pkg)-version)
 		@$$($$(UPPER_CASE_PKG)_OPENPOWER_VERSION_FILE)
@@ -192,4 +191,11 @@
 		@cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
 		@echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
 
+# Rule to force re-generation of all versioned subpackages
+$(1)-build-version-all: $$(foreach pkg,$$(OPENPOWER_VERSIONED_SUBPACKAGES), $$(pkg)-build-version)
+		@$$($$(UPPER_CASE_PKG)_OPENPOWER_VERSION_FILE)
+		@echo "=== $$(UPPER_CASE_PKG)_VERSION ==="
+		@cat $$($$(UPPER_CASE_PKG)_VERSION_FILE)
+		@echo ""; echo "**See openpower/package/VERSION.readme for detailed info on package strings"; echo ""
+
 endef