diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1604
index 2aaa647..5c05411 100644
--- a/ci/Dockerfile/ubuntu1604
+++ b/ci/Dockerfile/ubuntu1604
@@ -7,4 +7,4 @@
   build-essential g++ git bison flex unzip \
   cpio vim-common lsb-release \
   libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \
-  wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata
+  wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata bsdmainutils
diff --git a/doc/release-notes/v2.0.4.rst b/doc/release-notes/v2.0.4.rst
index 85721dd..a8f7af6 100644
--- a/doc/release-notes/v2.0.4.rst
+++ b/doc/release-notes/v2.0.4.rst
@@ -70,12 +70,12 @@
 
 `Repository <https://github.com/open-power/hostboot>`__
 
-.. _patches-1:
+.. _v2.0.4-patches-1:
 
 Patches
 ~~~~~~~
 
-.. _commits-1:
+.. _v2.0.4-commits-1:
 
 Commits
 ~~~~~~~
@@ -164,12 +164,12 @@
 
 `Repository <https://github.com/open-power/occ>`__
 
-.. _patches-2:
+.. _v2.0.4-patches-2:
 
 Patches
 ~~~~~~~
 
-.. _commits-2:
+.. _v2.0.4-commits-2:
 
 Commits
 ~~~~~~~
@@ -192,12 +192,12 @@
 
 `Repository <https://github.com/open-power/sbe>`__
 
-.. _patches-3:
+.. _v2.0.4-patches-3:
 
 Patches
 ~~~~~~~
 
-.. _commits-3:
+.. _v2.0.4-commits-3:
 
 Commits
 ~~~~~~~
@@ -231,12 +231,12 @@
 
 `Repository <https://github.com/open-power/skiboot>`__
 
-.. _patches-4:
+.. _v2.0.4-patches-4:
 
 Patches
 ~~~~~~~
 
-.. _commits-4:
+.. _v2.0.4-commits-4:
 
 Commits
 ~~~~~~~
diff --git a/doc/release-notes/v2.0.6.rst b/doc/release-notes/v2.0.6.rst
index 498f37e..44e58d3 100644
--- a/doc/release-notes/v2.0.6.rst
+++ b/doc/release-notes/v2.0.6.rst
@@ -113,12 +113,12 @@
 
 `Repository <https://github.com/open-power/hostboot>`__
 
-.. _patches-1:
+.. _v2.0.6-patches-1:
 
 Patches
 ~~~~~~~
 
-.. _commits-1:
+.. _v2.0.6-commits-1:
 
 Commits
 ~~~~~~~
@@ -197,12 +197,12 @@
 
 `Repository <https://github.com/open-power/occ>`__
 
-.. _patches-2:
+.. _v2.0.6-patches-2:
 
 Patches
 ~~~~~~~
 
-.. _commits-2:
+.. _v2.0.6-commits-2:
 
 Commits
 ~~~~~~~
@@ -217,14 +217,14 @@
 
 `Repository <https://github.com/open-power/petitboot>`__
 
-.. _patches-3:
+.. _v2.0.6-patches-3:
 
 Patches
 ~~~~~~~
 
 -  `petitboot-01-autotools-Add-autopoint-generated-files.patch <https://github.com/open-power/op-build/tree/HEAD/openpower/package/petitboot/petitboot-01-autotools-Add-autopoint-generated-files.patch>`__
 
-.. _commits-3:
+.. _v2.0.6-commits-3:
 
 Commits
 ~~~~~~~
@@ -234,12 +234,12 @@
 
 `Repository <https://github.com/open-power/sbe>`__
 
-.. _patches-4:
+.. _v2.0.6-patches-4:
 
 Patches
 ~~~~~~~
 
-.. _commits-4:
+.. _v2.0.6-commits-4:
 
 Commits
 ~~~~~~~
diff --git a/doc/release-notes/v2.0.8.rst b/doc/release-notes/v2.0.8.rst
index 813772e..24a03e2 100644
--- a/doc/release-notes/v2.0.8.rst
+++ b/doc/release-notes/v2.0.8.rst
@@ -51,12 +51,12 @@
 
 `Repository <https://github.com/open-power/hostboot>`__
 
-.. _patches-1:
+.. _v2.0.8-patches-1:
 
 Patches
 ~~~~~~~
 
-.. _commits-1:
+.. _v2.0.8-commits-1:
 
 Commits
 ~~~~~~~
diff --git a/doc/release-notes/v2.1-rc1.rst b/doc/release-notes/v2.1-rc1.rst
index 4ade51d..098ec95 100644
--- a/doc/release-notes/v2.1-rc1.rst
+++ b/doc/release-notes/v2.1-rc1.rst
@@ -175,12 +175,12 @@
 
 `Repository <https://github.com/open-power/hostboot>`__
 
-.. _patches-1:
+.. _v2.1-rc1-patches-1:
 
 Patches
 ~~~~~~~
 
-.. _commits-1:
+.. _v2.1-rc1-commits-1:
 
 Commits
 ~~~~~~~
@@ -837,12 +837,12 @@
 
 `Repository <https://github.com/open-power/occ>`__
 
-.. _patches-2:
+.. _v2.1-rc1-patches-2:
 
 Patches
 ~~~~~~~
 
-.. _commits-2:
+.. _v2.1-rc1-commits-2:
 
 Commits
 ~~~~~~~
@@ -869,14 +869,14 @@
 
 `Repository <https://github.com/open-power/petitboot>`__
 
-.. _patches-3:
+.. _v2.1-rc1-patches-3:
 
 Patches
 ~~~~~~~
 
 -  `petitboot-01-autotools-Add-autopoint-generated-files.patch <https://github.com/open-power/op-build/tree/HEAD/openpower/package/petitboot/petitboot-01-autotools-Add-autopoint-generated-files.patch>`__
 
-.. _commits-3:
+.. _v2.1-rc1-commits-3:
 
 Commits
 ~~~~~~~
@@ -886,12 +886,12 @@
 
 `Repository <https://github.com/open-power/sbe>`__
 
-.. _patches-4:
+.. _v2.1-rc1-patches-4:
 
 Patches
 ~~~~~~~
 
-.. _commits-4:
+.. _v2.1-rc1-commits-4:
 
 Commits
 ~~~~~~~
@@ -951,12 +951,12 @@
 
 `Repository <https://github.com/open-power/skiboot>`__
 
-.. _patches-5:
+.. _v2.1-rc1-patches-5:
 
 Patches
 ~~~~~~~
 
-.. _commits-5:
+.. _v2.1-rc1-commits-5:
 
 Commits
 ~~~~~~~
@@ -1119,12 +1119,12 @@
 
 `Repository <https://github.com/open-power/zaius-xml>`__
 
-.. _patches-6:
+.. _v2.1-rc1-patches-6:
 
 Patches
 ~~~~~~~
 
-.. _commits-6:
+.. _v2.1-rc1-commits-6:
 
 Commits
 ~~~~~~~
diff --git a/doc/release-notes/v2.1.rst b/doc/release-notes/v2.1.rst
index 7189c7f..d296d80 100644
--- a/doc/release-notes/v2.1.rst
+++ b/doc/release-notes/v2.1.rst
@@ -192,12 +192,12 @@
 
 `Repository <https://github.com/open-power/hostboot>`__
 
-.. _patches-1:
+.. _v2.1-patches-1:
 
 Patches
 ~~~~~~~
 
-.. _commits-1:
+.. _v2.1-commits-1:
 
 Commits
 ~~~~~~~
@@ -866,12 +866,12 @@
 
 `Repository <https://github.com/open-power/occ>`__
 
-.. _patches-2:
+.. _v2.1-patches-2:
 
 Patches
 ~~~~~~~
 
-.. _commits-2:
+.. _v2.1-commits-2:
 
 Commits
 ~~~~~~~
@@ -898,12 +898,12 @@
 
 `Repository <https://github.com/open-power/op-build>`__
 
-.. _patches-3:
+.. _v2.1-patches-3:
 
 Patches
 ~~~~~~~
 
-.. _commits-3:
+.. _v2.1-commits-3:
 
 Commits
 ~~~~~~~
@@ -915,12 +915,12 @@
 
 `Repository <https://github.com/open-power/p9dsu-xml>`__
 
-.. _patches-4:
+.. _v2.1-patches-4:
 
 Patches
 ~~~~~~~
 
-.. _commits-4:
+.. _v2.1-commits-4:
 
 Commits
 ~~~~~~~
@@ -932,12 +932,12 @@
 
 `Repository <https://github.com/open-power/palmetto-xml>`__
 
-.. _patches-5:
+.. _v2.1-patches-5:
 
 Patches
 ~~~~~~~
 
-.. _commits-5:
+.. _v2.1-commits-5:
 
 Commits
 ~~~~~~~
@@ -949,14 +949,14 @@
 
 `Repository <https://github.com/open-power/petitboot>`__
 
-.. _patches-6:
+.. _v2.1-patches-6:
 
 Patches
 ~~~~~~~
 
 -  `petitboot-01-autotools-Add-autopoint-generated-files.patch <https://github.com/open-power/op-build/tree/v2.1/openpower/package/petitboot/petitboot-01-autotools-Add-autopoint-generated-files.patch>`__
 
-.. _commits-6:
+.. _v2.1-commits-6:
 
 Commits
 ~~~~~~~
@@ -966,12 +966,12 @@
 
 `Repository <https://github.com/open-power/pnor>`__
 
-.. _patches-7:
+.. _v2.1-patches-7:
 
 Patches
 ~~~~~~~
 
-.. _commits-7:
+.. _v2.1-commits-7:
 
 Commits
 ~~~~~~~
@@ -983,12 +983,12 @@
 
 `Repository <https://github.com/open-power/romulus-xml>`__
 
-.. _patches-8:
+.. _v2.1-patches-8:
 
 Patches
 ~~~~~~~
 
-.. _commits-8:
+.. _v2.1-commits-8:
 
 Commits
 ~~~~~~~
@@ -1000,12 +1000,12 @@
 
 `Repository <https://github.com/open-power/sbe>`__
 
-.. _patches-9:
+.. _v2.1-patches-9:
 
 Patches
 ~~~~~~~
 
-.. _commits-9:
+.. _v2.1-commits-9:
 
 Commits
 ~~~~~~~
@@ -1130,12 +1130,12 @@
 
 `Repository <https://github.com/open-power/skiboot>`__
 
-.. _patches-10:
+.. _v2.1-patches-10:
 
 Patches
 ~~~~~~~
 
-.. _commits-10:
+.. _v2.1-commits-10:
 
 Commits
 ~~~~~~~
@@ -1330,12 +1330,12 @@
 
 `Repository <https://github.com/open-power/zaius-xml>`__
 
-.. _patches-11:
+.. _v2.1-patches-11:
 
 Patches
 ~~~~~~~
 
-.. _commits-11:
+.. _v2.1-commits-11:
 
 Commits
 ~~~~~~~
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index 35f87e3..19d2d6e 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -3,7 +3,7 @@
 # ima-catalog.mk
 #
 ################################################################################
-IMA_CATALOG_VERSION ?= 00f32f77797c10e349e1d4079683f456455f6bf5 
+IMA_CATALOG_VERSION ?= 3d30c7aca6c8ef066f92384271827ad5b66392bf 
 IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
 IMA_CATALOG_LICENSE = Apache-2.0
 IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 9c65a6f..04511fb 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -167,7 +167,10 @@
             $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(BINARIES_DIR); \
         fi
 
-	    tar --transform 's/.*\//host_fw_debug/g' -zcvf $(OUTPUT_IMAGES_DIR)/host_fw_debug.tar $(FILES_TO_TAR)
+	#Create Debug Tarball
+	mkdir -p $(STAGING_DIR)/pnor/host_fw_debug_tarball_files/
+	cp -r $(FILES_TO_TAR) $(STAGING_DIR)/pnor/host_fw_debug_tarball_files/
+	tar -zcvf $(OUTPUT_IMAGES_DIR)/host_fw_debug.tar -C $(STAGING_DIR)/pnor/host_fw_debug_tarball_files/  .
 
 endef
 
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 614d577..1515b90 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.1" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.1-85-gf83568436527" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION