diff --git a/doc/process/index.rst b/doc/process/index.rst
index 4efe358..1d0af3e 100644
--- a/doc/process/index.rst
+++ b/doc/process/index.rst
@@ -6,3 +6,4 @@
    CONTRIBUTING.md
    KernelTree.rst
    building-with-ci
+   stable-rules.rst
diff --git a/doc/process/stable-rules.rst b/doc/process/stable-rules.rst
new file mode 100644
index 0000000..629e7f5
--- /dev/null
+++ b/doc/process/stable-rules.rst
@@ -0,0 +1,73 @@
+.. _stable-rules:
+
+=======================================
+op-build stable tree rules and releases
+=======================================
+
+Our stable tree process follows processes similar to other open source projects
+such as the Linux Kernel and Buildroot, as do several OpenPOWER Firmware
+components such as Skiboot and Petitboot.
+
+The purpose of a -stable tree is to give vendors a stable base to create
+firmware releases from and to incorporate into service packs. New stable
+releases contain critical fixes only.
+
+As a general rule, only the most recent op-build release gets a maintained
+-stable tree. If you wish to maintain an older tree, speak up! For example,
+with my IBMer hat on, we'll maintain branches that we ship in products.
+
+What patches are accepted?
+--------------------------
+
+* Patches must be obviously correct and tested
+
+  * A Tested-by signoff is *important*
+* A patch must fix a real bug
+* No trivial patches, such fixups belong in main branch
+* Not fix a purely theoretical problem unless you can prove how
+  it's exploitable
+* The patch, or an equivalent one, must already be in master
+
+  * Submitting to both at the same time is okay, but back-porting is better
+
+HOWTO submit to stable
+----------------------
+
+1. Make a pull request with "[stable op-build-N.N.y]" in subject (where N.N.y
+   is the stable branch to which you are targeting)
+
+   * This targets the patch *ONLY* to the stable branch.
+
+     * Such commits will *NOT* be merged into master.
+   * Use this when:
+
+     a. cherry-picking a fix from master
+     b. fixing something that is only broken in stable
+     c. fix in stable needs to be completely different than in master
+
+     If b or c: explain why.
+   * If cherry-picking, include the following at the top of your
+     commit message (or use the -x option to git-cherry-pick): ::
+
+       commit <sha1> upstream.
+   * If the patch has been modified, explain why in description.
+
+2. Add a comment on the PR indicating that a PR should also go to a stable
+   branch when making a Pull request to master
+
+   * This targets the patch to master and stable.
+   * You can target a patch to a specific stable tree by putting that in the
+     comment
+   * You can ask for prerequisites to be cherry-picked.
+
+Trees
+-----
+
+* https://github.com/open-power/op-build/ (or via ssh at ``git@github.com:open-power/op-build.git`` )
+
+  * (branches are op-build-X.Y.y - e.g. op-build-2.0.y)
+
+* Some stable versions may last longer than others
+
+  * So there may be op-build-2.0.y and op-build-2.4.y actively maintained
+    and op-build-2.0.y could possibly outlast op-build-2.4.y.
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 6544830..f89b739 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 72c2578..ee7abaf 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -14,7 +14,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -38,6 +38,7 @@
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
 BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_IPRUTILS=y
 BR2_PACKAGE_UTIL_LINUX_AGETTY=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index ab3830e..2dab374 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index c9570fb..cffd77c 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 2ce0361..3d621b6 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/hostboot/mihawk.config b/openpower/configs/hostboot/mihawk.config
new file mode 100755
index 0000000..4f257c4
--- /dev/null
+++ b/openpower/configs/hostboot/mihawk.config
@@ -0,0 +1,73 @@
+# The BMC MBOX Protocol is used to access PNOR
+unset SFC_IS_AST2500
+unset SFC_IS_AST2400
+set   PNORDD_IS_BMCMBOX
+unset PNORDD_IS_SFC
+unset BMC_DOES_SFC_INIT
+unset SFC_IS_IBM_DPSS
+set   ALLOW_MICRON_PNOR
+set   ALLOW_MACRONIX_PNOR
+
+# VPD options.
+set MVPD_READ_FROM_HW
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_PNOR
+set DJVPD_READ_FROM_HW
+unset DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
+set MEMVPD_READ_FROM_HW
+set MEMVPD_WRITE_TO_HW
+set MEMVPD_READ_FROM_PNOR
+set MEMVPD_WRITE_TO_PNOR
+set PVPD_READ_FROM_HW
+set PVPD_WRITE_TO_HW
+set PVPD_READ_FROM_PNOR
+set PVPD_WRITE_TO_PNOR
+unset CDIMM_FORMAT_FOR_CVPD
+
+# gpio config
+set GPIODD
+unset PALMETTO_VDDR
+
+# Enable Consecutive SBE Updates
+set   SBE_UPDATE_CONSECUTIVE
+unset SBE_UPDATE_INDEPENDENT
+unset SBE_UPDATE_SEQUENTIAL
+unset SBE_UPDATE_SIMULTANEOUS
+unset NO_SBE_UPDATES
+
+unset PCIE_HOTPLUG_CONTROLLER
+
+# turn on console output
+set CONSOLE
+set BMC_AST2500
+
+unset DISABLE_HOSTBOOT_RUNTIME
+
+# Compile in hostboot runtime PRD
+set HBRT_PRD
+
+# Compile in hb rt HTMGT : Load/Start OCC
+set HTMGT
+set START_OCC_DURING_BOOT
+unset CONSOLE_OUTPUT_OCC_COMM
+
+#PNOR flags
+unset PNOR_TWO_SIDE_SUPPORT
+
+set BMC_BT_LPC_IPMI
+
+# Enable IPLtime + Runtime Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
+
+# set for trace debug to console
+unset CONSOLE_OUTPUT_TRACE
+set CONSOLE_OUTPUT_FFDCDISPLAY
+
+
+set SECUREBOOT
+set TPMDD
+set TPM_NUVOTON
diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig
new file mode 100644
index 0000000..4d266bb
--- /dev/null
+++ b/openpower/configs/mihawk_defconfig
@@ -0,0 +1,70 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/mihawk-patches"
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_GCC_VERSION_6_X=y
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
+BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
+BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/users-table"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/configs/busybox.fragment"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
+BR2_PACKAGE_CRYPTSETUP=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_IPMITOOL_USB=y
+BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SERVER is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_UTIL_LINUX_AGETTY=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER9=y
+BR2_HOSTBOOT_CONFIG_FILE="mihawk.config"
+BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="mihawk-xml"
+BR2_OPENPOWER_MACHINE_XML_VERSION="b9929ba9fd96d78da01bce8a2a157851dce9e5cb"
+BR2_OPENPOWER_MACHINE_XML_FILENAME="mihawk.xml"
+BR2_OPENPOWER_SYSTEM_XML_FILENAME="MIHAWK_hb.system.xml"
+BR2_OPENPOWER_MRW_XML_FILENAME="MIHAWK_hb.mrw.xml"
+BR2_OPENPOWER_BIOS_XML_FILENAME="MIHAWK_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
+BR2_OPENPOWER_CONFIG_NAME="mihawk"
+BR2_OPENPOWER_PNOR_FILENAME="mihawk.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="MIHAWK_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="MIHAWK_HB.targeting.bin.ecc"
+BR2_BUILD_PNOR_SQUASHFS=y
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER9"
diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig
index 77110ba..4fbe143 100644
--- a/openpower/configs/nicole_defconfig
+++ b/openpower/configs/nicole_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -28,6 +28,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
@@ -43,7 +44,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="nicole.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="nicole-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="26b2092922594c0ce21bc2bef7fb11bbc164f0b5"
+BR2_OPENPOWER_MACHINE_XML_VERSION="c592dee10cab58d05a62fb1ddb98c14e5b3dfbe7"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="nicole.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="NICOLE_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="NICOLE_hb.mrw.xml"
diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig
index 83e59be..dab4a3c 100644
--- a/openpower/configs/opal_defconfig
+++ b/openpower/configs/opal_defconfig
@@ -12,7 +12,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -28,6 +28,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/p8dtu_defconfig b/openpower/configs/p8dtu_defconfig
index 68bb943..9a31acf 100644
--- a/openpower/configs/p8dtu_defconfig
+++ b/openpower/configs/p8dtu_defconfig
@@ -17,7 +17,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -33,6 +33,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 6a545fd..0c539a9 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -33,6 +33,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index b00e7d9..9b34974 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -14,7 +14,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -30,6 +30,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig
index b1ddfc6..8aebed5 100644
--- a/openpower/configs/pseries_defconfig
+++ b/openpower/configs/pseries_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 4bfb89e..4d1be4d 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig
index 68a320d..8826acd 100644
--- a/openpower/configs/vesnin_defconfig
+++ b/openpower/configs/vesnin_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -31,6 +31,7 @@
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 7f82406..79a9511 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
@@ -47,7 +48,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="a6f4df381b970f62ce86bd5d43e0b4fa6c90f5b3"
+BR2_OPENPOWER_MACHINE_XML_VERSION="c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 272fcc0..f73fc77 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -32,6 +32,7 @@
 BR2_PACKAGE_IPMITOOL=y
 BR2_PACKAGE_IPMITOOL_USB=y
 BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_PCIUTILS=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index 4779ed8..5dfc8de 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -14,7 +14,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.2.9"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
@@ -38,6 +38,7 @@
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
 BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_IPRUTILS=y
 BR2_PACKAGE_UTIL_LINUX_AGETTY=y
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch
index 005e3c4..6f7b738 100644
--- a/openpower/linux/0002-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0002-Release-OpenPower-kernel.patch
@@ -9,13 +9,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index d8f5dbfd6b76..ebb67da77d7c 100644
+index cfc667fe9959..67e8c2fb4ac6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,7 +2,7 @@
  VERSION = 5
  PATCHLEVEL = 2
- SUBLEVEL = 1
+ SUBLEVEL = 9
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Bobtail Squid
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index 6e3fc97..903e6cb 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -21,4 +21,4 @@
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/sbe/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/sb-signing-utils/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/sb-signing-framework/Config.in"
-
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/ocmb-explorer-fw/Config.in"
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 2113d68..4c9e5f5 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_HCODE_VERSION
 	string
-	default "hw071319a.940" if BR2_HCODE_LATEST_VERSION
+	default "hw081619a.940" if BR2_HCODE_LATEST_VERSION
 	default BR2_HCODE_CUSTOM_VERSION_VALUE \
 		if BR2_HCODE_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index fe28868..861dc3e 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
 
 config BR2_HOSTBOOT_BINARIES_VERSION
 	string
-	default "hw062819a.940" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "hw080119a.940" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
 	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
 
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index ab48e55..445edac 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "3a513ca00ae74a46de34d5e95abbd43adbc7a32e" if BR2_HOSTBOOT_LATEST_VERSION
+	default "01ac1b8dc22e3cba20a194fee7d741b749658223" if BR2_HOSTBOOT_LATEST_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index 77b29d7..1642400 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -43,7 +43,7 @@
 
 config BR2_OCC_VERSION
 	string
-	default "e5a2afd6cfb06cddf18e42d6be61366acc5616c6" if BR2_OCC_LATEST_VERSION
+	default "1e8731f62fa73292197d85757987eebc055c5cc1" if BR2_OCC_LATEST_VERSION
 	default BR2_OCC_CUSTOM_VERSION_VALUE \
 		if BR2_OCC_CUSTOM_VERSION
 
diff --git a/openpower/package/ocmb-explorer-fw/Config.in b/openpower/package/ocmb-explorer-fw/Config.in
new file mode 100644
index 0000000..92d61ea
--- /dev/null
+++ b/openpower/package/ocmb-explorer-fw/Config.in
@@ -0,0 +1,35 @@
+config BR2_PACKAGE_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 "v0.b" if BR2_OCMB_EXPLORER_FW_LATEST_VERSION
+	default BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE \
+		if BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
+
+config BR2_OCMB_EXPLORER_FW_URL
+        string
+        default "https://github.com/open-power/ocmb-explorer-fw"
+
+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..9aa4eb1
--- /dev/null
+++ b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# 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-util/openpower-pnor-util.mk b/openpower/package/openpower-pnor-util/openpower-pnor-util.mk
index b7f508a..4681962 100644
--- a/openpower/package/openpower-pnor-util/openpower-pnor-util.mk
+++ b/openpower/package/openpower-pnor-util/openpower-pnor-util.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOST_OPENPOWER_PNOR_UTIL_VERSION ?= e499446423d6ebe96f74e079de36a8929d47277b
+HOST_OPENPOWER_PNOR_UTIL_VERSION ?= d23b5b74cfadea0618e5984e8d3565d2696d26b8
 HOST_OPENPOWER_PNOR_UTIL_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_PNOR_UTIL_VERSION))
 HOST_OPENPOWER_PNOR_UTIL_DEPENDENCIES = host-squashfs host-libflash
 
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 0f9a10d..82280f5 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -156,7 +156,7 @@
 
 config BR2_OCMBFW_FILENAME
         string "Name of the OCMBFW Update original file"
-        default "ocmbfw.bin"
+        default "signed_app_fw.mem"
         help
             String used to define name of OCBMFW Update original file (before any processing occurs)
 
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 769a58d..7f08682 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= 03469302c58f65ff57082792cdda159795f6e488
+OPENPOWER_PNOR_VERSION ?= 1bfff01c57d1186ebbfbcd9daabbace1f6092375
 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -69,11 +69,11 @@
 HOSTBOOT_BUILD_IMAGES_DIR = $(STAGING_DIR)/hostboot_build_images/
 
 FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
-               $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.elf \
-               $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.map \
-               $(OUTPUT_BUILD_DIR)/linux-*/.config \
-               $(OUTPUT_BUILD_DIR)/linux-*/vmlinux \
-               $(OUTPUT_BUILD_DIR)/linux-*/System.map \
+               $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.elf \
+               $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.map \
+               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)/.config \
+               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)/vmlinux \
+               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)/System.map \
                $(OUTPUT_IMAGES_DIR)/zImage.epapr
 
 
@@ -129,7 +129,9 @@
             -payload_filename $(BR2_SKIBOOT_LID_XZ_NAME) \
             -binary_dir $(BINARIES_DIR) \
             -bootkernel_filename $(LINUX_IMAGE_NAME) \
-	    -ocmbfw_original_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_FILENAME) \
+	    -ocmbfw_version $(BR2_OCMB_EXPLORER_FW_VERSION) \
+	    -ocmbfw_url $(BR2_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) \
             $(XZ_ARG) $(KEY_TRANSITION_ARG) $(SIGN_MODE_ARG) \
diff --git a/openpower/package/petitboot/Config.in b/openpower/package/petitboot/Config.in
index ef002b4..5925345 100644
--- a/openpower/package/petitboot/Config.in
+++ b/openpower/package/petitboot/Config.in
@@ -12,8 +12,6 @@
 	# run-time dependency only
 	select BR2_PACKAGE_POWERPC_UTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	# run-time dependency only
-	select BR2_PACKAGE_IPRUTILS if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
-	# run-time dependency only
 	select BR2_PACKAGE_NVME if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	help
 	  Petitboot is a small kexec-based bootloader
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index 3e7d402..9d9a0ac 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -26,7 +26,7 @@
 
 config BR2_SBE_VERSION
 	string
-	default "6d59ceee8556de3e04cb8fae7346db160c736c46" if BR2_SBE_LATEST_VERSION
+	default "50895b93a8e4390b0990ee22824c8a5ee28ea9f8" if BR2_SBE_LATEST_VERSION
 	default BR2_SBE_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_CUSTOM_VERSION
 
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 1944e94..3528186 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.4" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.5-7-g7b12d5489" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION
 
diff --git a/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch b/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch
new file mode 100644
index 0000000..7f94247
--- /dev/null
+++ b/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch
@@ -0,0 +1,45 @@
+From d614a89e71564d8d300e25fb76c5a4553fe35876 Mon Sep 17 00:00:00 2001
+From: joy_chu <joy_chu@wistron.com>
+Date: Mon, 22 Jul 2019 18:57:17 +0800
+Subject: [PATCH] Modify: modify amec power sensor calculation
+
+The offset value will be added to APSS raw value when APSS raw value is not 0.
+
+Signed-off-by: joy_chu <joy_chu@wistron.com>
+---
+ src/occ_405/amec/amec_sensors_power.c | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/src/occ_405/amec/amec_sensors_power.c b/src/occ_405/amec/amec_sensors_power.c
+index 5c0ec54..2612598 100755
+--- a/src/occ_405/amec/amec_sensors_power.c
++++ b/src/occ_405/amec/amec_sensors_power.c
+@@ -173,14 +173,18 @@ uint32_t amec_value_from_apss_adc(uint8_t i_chan)
+         // Read Raw Value in mA (divide masked channel data by 2)
+         l_raw = (G_dcom_slv_inbox_rx.adc[i_chan] & APSS_12BIT_ADC_MASK)/2;
+         // Apply offset and gain
+-        if (l_offset & 0x80000000)
++        // Add offset if Raw Value is not zero
++	if (l_raw != 0)
+         {
+-            // Negative offset
+-            l_raw -= (~l_offset + 1);
+-        }
+-        else
+-        {
+-            l_raw += l_offset;
++            if (l_offset & 0x80000000)
++            {
++                // Negative offset
++                l_raw -= (~l_offset + 1);
++	    }
++	    else
++            {
++                l_raw += l_offset;
++            }
+         }
+         //Check to see if l_raw is negative.  If so, set raw to 0
+         if (l_raw & 0x8000)
+-- 
+2.7.4
+