diff --git a/.gitignore b/.gitignore
index 4c2780d..dde235b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,5 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u111-b16.tar.xz
 /openjdk8-forests-latest-aarch64-aarch64-jdk8u121-b14.tar.xz
 /openjdk8-forests-latest-shenandoah-aarch64-shenandoah-jdk8u121-b14.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u121-b14.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 3c3ea1c..21846a1 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -19,6 +19,12 @@
 # level folder, name is created, based on parameter
 #
 
+if [ ! "x$PR2126" = "x" ] ; then
+  if [ ! -f "$PR2126" ] ; then
+    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+    exit 1
+  fi
+fi
 set -e
 
 OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 31a1196..c5625de 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -168,8 +168,8 @@
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
-%global project         openjdk8-forests
-%global repo            latest-aarch64
+%global project         aarch64-port
+%global repo            jdk8u
 %global revision        aarch64-jdk8u121-b14
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{revision}; echo ${VERSION%%-*})
@@ -771,7 +771,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 8.%{buildver}%{?dist}
+Release: 9.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -827,7 +827,7 @@ Source20: repackReproduciblePolycies.sh
 Source100: config.guess
 Source101: config.sub
 # shenandoah hotpost
-Source999: openjdk8-forests-latest-shenandoah-aarch64-shenandoah-jdk8u121-b14.tar.xz
+Source999: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20.tar.xz
 
 # RPM/distribution specific patches
 
@@ -1900,6 +1900,14 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Feb 28 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.121-9.b14
+- updated to latest stable shenandoah hotspot
+- updated to properly tagged upstream forest (no update, just rename)
+- fixed update package to verify PR2126 patch and work with sha512
+
+* Tue Feb 28 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.121-8.b14
+- rebuild because of NSS
+
 * Tue Feb 21 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.121-7.b14
 - fixed the config(noreplace) issue with various left files lke java.security (rhbz#1183793)
 - by calling new c-j-c hooks
diff --git a/sources b/sources
index a026ed4..a10e03a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (systemtap-tapset-3.1.0.tar.xz) = e3558dc9d56dff5125a869807135e84ca73a2640d8d8fff2f45dc0dd7d153b81b48c08480e09a75667eba62362f74091465fac622aa0d9b104bfb18b4eba80e1
-SHA512 (openjdk8-forests-latest-aarch64-aarch64-jdk8u121-b14.tar.xz) = 8a5418c0560736d3450bbb4f3a0b19d028713f39634630d4e3689c664f25e2dbe9473c3657d5e02c5c614a37dce3cfb9db93a449f5f7f0294dec748514b67dc8
-SHA512 (openjdk8-forests-latest-shenandoah-aarch64-shenandoah-jdk8u121-b14.tar.xz) = 1b7e9a598fb43c96599393fbe712056e8031ddd985d9abe5e4ffdaa309a9b43659da29f9d9294cd0dab8cbb1d19fc8149c49fee6e81fced120c18d59f015ce81
+SHA512 (aarch64-port-jdk8u-aarch64-jdk8u121-b14.tar.xz) = 2fbda6c3b0b4269d75e0c79db55b851f616d7ba07614cfa60e85f17d3503cc8765083f5ff6e2657e9c3b08055169130dc6419bcad312b98d18829e147645d516
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20.tar.xz) = 850e883281b4695bdb8728fba5bb96753cb740efa3bac760ca3b9a036c0268541aa3e8c1366f6add01735de8fbff1d3809452cf0731a8f6b99c07c5a9f566487
diff --git a/update_package.sh b/update_package.sh
index e517d15..e2d9899 100755
--- a/update_package.sh
+++ b/update_package.sh
@@ -15,6 +15,13 @@
 #
 # the used values are then substituted to spec and sources
 
+if [ ! "x$PR2126" = "x" ] ; then
+  if [ ! -f "$PR2126" ] ; then
+    echo "You have specified PR2126 as $PR2126 but it does not exists. exiting"
+    exit 1
+  fi
+fi
+
 set -e
 
 if [ "x$PROJECT_NAME" = "x" ] ; then
@@ -102,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then
     VERSION="tip"
 else
 	#hardcoding version for anything else except tip
-    VERSION="aarch64-shenandoah-jdk8u121-b14"
+    VERSION="aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20"
 fi
 MAIN_REPO_NAME=$REPO_NAME
 REPO_NAME=jdk8u-shenandoah
@@ -124,7 +131,7 @@ git --no-pager diff $SPEC
 # find the most similar sources name and replace it by newly generated one.
 echo "Old sources"
 cat sources
-a_sources=`cat sources | sed "s/.*\s\+//g"`
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
 winner=""
 winnerDistance=999999
 for x in $a_sources ; do
@@ -151,7 +158,7 @@ sed -i "s;.*$winner;$sum;" sources
 
 echo "New sources"
 cat sources
-a_sources=`cat sources | sed "s/.*\s\+//g"`
+a_sources=`cat sources | sed "s/.*(//g" | sed "s/).*//g" | sed "s/.*\s\+//g"`
 echo "    you can get inspired by following %changelog template:"
 user_name=`whoami`
 user_record=$(getent passwd $user_name)