diff --git a/.gitignore b/.gitignore
index 85ac28b..5bab61c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/icedtea6-1.13.7.tar.xz
+SOURCES/icedtea6-1.13.8.tar.xz
 SOURCES/java-access-bridge-1.23.0.tar.bz2
-SOURCES/openjdk-6-src-b35-14_apr_2015-rhel.tar.xz
+SOURCES/openjdk-6-src-b36-22_jul_2015-rhel.tar.xz
diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata
index 67687da..b32cc5d 100644
--- a/.java-1.6.0-openjdk.metadata
+++ b/.java-1.6.0-openjdk.metadata
@@ -1,3 +1,3 @@
-a6aa43fcc2e76daebb72079032d097f525f99e48 SOURCES/icedtea6-1.13.7.tar.xz
+f3d14a2acdf703122b1fd05f62ecabf8519973b4 SOURCES/icedtea6-1.13.8.tar.xz
 aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2
-e9b8b30704dbb4d52b7046bc443f2eb152fc4a9b SOURCES/openjdk-6-src-b35-14_apr_2015-rhel.tar.xz
+e3d443a8b0cb7973a01984b3cf63f453c81a9f7d SOURCES/openjdk-6-src-b36-22_jul_2015-rhel.tar.xz
diff --git a/SOURCES/no_pr2125.patch b/SOURCES/no_pr2125.patch
index 6226e1f..86b424e 100644
--- a/SOURCES/no_pr2125.patch
+++ b/SOURCES/no_pr2125.patch
@@ -1,9 +1,11 @@
-diff -r f0c900038574 fsg.sh.in
---- a/fsg.sh.in	Tue Jan 20 06:46:55 2015 +0000
-+++ b/fsg.sh.in	Tue Jan 20 07:12:11 2015 +0000
-@@ -90,5 +90,3 @@
+diff -r 9fca0eafd25a fsg.sh.in
+--- a/fsg.sh.in	Wed Jul 22 22:29:27 2015 +0100
++++ b/fsg.sh.in	Wed Jul 22 23:22:08 2015 +0100
+@@ -90,7 +90,3 @@
      openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \
      openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1
  
--echo "Syncing EC list with NSS"
--patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch
+-if test "x@ENABLE_NON_NSS_CURVES@" = "xno"; then
+-  echo "Syncing EC list with NSS"
+-  patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch
+-fi
diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec
index fa6d9c9..d640f1c 100644
--- a/SPECS/java-1.6.0-openjdk.spec
+++ b/SPECS/java-1.6.0-openjdk.spec
@@ -7,10 +7,10 @@
 %define debug 0
 
 
-%define icedteaver 1.13.7
+%define icedteaver 1.13.8
 %define icedteasnapshot %{nil}
-%define openjdkver 35
-%define openjdkdate 14_apr_2015
+%define openjdkver 36
+%define openjdkdate 22_jul_2015
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -882,6 +882,15 @@ exit 0
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 28 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.6.0.36-1.13.8.1
+- Update tarball to fix TCK regression (PR2565)
+- Resolves: rhbz#1235153
+
+* Wed Jul 22 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.6.0.36-1.13.8.0
+- Update to IcedTea 1.13.8
+- Update no_pr2125.patch to work against new version.
+- Resolves: rhbz#1235153
+
 * Fri Apr 10 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.6.0.35-1.13.7.1
 - Repackaged source files
 - Resolves: rhbz#1209067