diff --git a/.gitignore b/.gitignore
index f367b05..9fccd5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/aarch64-port-jdk8u-aarch64-jdk8u141-b16.tar.xz
-SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz
+SOURCES/aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz
+SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
 SOURCES/systemtap-tapset-3.4.0pre01.tar.xz
diff --git a/.java-1.8.0-openjdk.metadata b/.java-1.8.0-openjdk.metadata
index 1017092..bfe4f08 100644
--- a/.java-1.8.0-openjdk.metadata
+++ b/.java-1.8.0-openjdk.metadata
@@ -1,3 +1,3 @@
-fe554a6a2df47d439eae236066b15ee1ad7d25ba SOURCES/aarch64-port-jdk8u-aarch64-jdk8u141-b16.tar.xz
-8d3d546f9ea94f8e017b0247e2976a759f183d5f SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz
+e984f390e38824a7790b084b5b7034b4926ad427 SOURCES/aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz
+272124edf4c68361df74ce6d15602339d3ad8d42 SOURCES/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
 efa1d5ce7cc2a4cf2c657d883bfb487432a588c0 SOURCES/systemtap-tapset-3.4.0pre01.tar.xz
diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec
index 1fc5225..66a76e7 100644
--- a/SPECS/java-1.8.0-openjdk.spec
+++ b/SPECS/java-1.8.0-openjdk.spec
@@ -178,10 +178,10 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global project         aarch64-port
 %global repo            jdk8u
-%global revision        aarch64-jdk8u141-b16
+%global revision        aarch64-jdk8u144-b01
 %global shenandoah_project	aarch64-port
 %global shenandoah_repo		jdk8u-shenandoah
-%global shenandoah_revision    	aarch64-shenandoah-jdk8u141-b16
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u144-b01
 
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{revision}; echo ${VERSION%%-*})
@@ -792,7 +792,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}%{?dist}
+Release: 0.%{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
@@ -1310,7 +1310,6 @@ sh %{SOURCE12}
 %patch551
 %patch552
 %patch553
-%patch554
 
 # RPM-only fixes
 %patch525
@@ -1322,6 +1321,12 @@ sh %{SOURCE12}
 %patch534
 %endif
 
+# 8175887 was added to the Shenandoah HotSpot ahead of time
+%if %{use_shenandoah_hotspot}
+%else
+%patch554
+%endif
+
 # Extract systemtap tapsets
 %if %{with_systemtap}
 tar -x -I xz -f %{SOURCE8}
@@ -1957,6 +1962,11 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Aug 15 2017 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.144-0.b01
+- Update to aarch64-jdk8u144-b01 and aarch64-shenandoah-jdk8u144-b01.
+- Exclude 8175887 from Shenandoah builds as it has been included in that repo.
+- Resolves: rhbz#1481947
+
 * Fri Jul 14 2017 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.141-2.b16
 - Update to aarch64-jdk8u141-b16 and aarch64-shenandoah-jdk8u141-b16.
 - Revert change to remove-intree-libraries.sh following backout of 8173207