diff --git a/java-1.8.0-openjdk-PStack-808293.patch b/java-1.8.0-openjdk-PStack-808293.patch
deleted file mode 100644
index eb8b8a0..0000000
--- a/java-1.8.0-openjdk-PStack-808293.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	2012-04-06 02:26:33.322164601 +0200
-+++ jdk8/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java	2012-04-06 02:26:57.958514071 +0200
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2012, Red Hat Inc.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -84,7 +85,8 @@
-                out.print("----------------- ");
-                out.print(th);
-                out.println(" -----------------");
--               while (f != null) {
-+               int maxStack = 256;
-+               while (f != null && maxStack-- > 0) {
-                   ClosestSymbol sym = f.closestSymbolToPC();
-                   Address pc = f.pc();
-                   out.print(pc + "\t");
-@@ -158,10 +160,19 @@
-                          }
-                       }
-                   }
-+                  Address oldPC = f.pc();
-+                  Address oldFP = f.localVariableBase();
-                   f = f.sender(th);
-+                  if (f != null
-+                      && oldPC.equals(f.pc())
-+                      && oldFP.equals(f.localVariableBase())) {
-+                      // We didn't make any progress
-+                      f = null;
-+                  }
-                }
-             } catch (Exception exp) {
--               exp.printStackTrace();
-+               // exp.printStackTrace();
-+               out.println("bad stack: " + exp);
-                // continue, may be we can do a better job for other threads
-             }
-             if (concurrentLocks) {
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index bb615f2..3ddc5fe 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -706,7 +706,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 11.%{buildver}%{?dist}
+Release: 12.%{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
@@ -764,15 +764,12 @@ Patch1:   %{name}-accessible-toolkit.patch
 
 # Restrict access to java-atk-wrapper classes
 Patch3: java-atk-wrapper-security.patch
-# RHBZ 808293
-Patch4: %{name}-PStack-808293.patch
 # Allow multiple initialization of PKCS11 libraries
 Patch5: multiple-pkcs11-library-init.patch
 # Include all sources in src.zip
 Patch7: include-all-srcs.patch
 # Problem discovered with make 4.0
 Patch12: removeSunEcProvider-RH1154143.patch
-Patch13: libjpeg-turbo-1.4-compat.patch
 
 #
 # OpenJDK specific patches
@@ -1062,11 +1059,9 @@ sh %{SOURCE12}
 
 %patch1
 %patch3
-%patch4
 %patch5
 %patch7
 %patch12
-%patch13
 
 # s390 build fixes
 %ifarch s390
@@ -1612,6 +1607,10 @@ fi
 %endif
 
 %changelog
+* Thu Dec 10 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.65-12.b17
+-removed patch4 java-1.8.0-openjdk-PStack-808293.patch
+-removed patch13 libjpeg-turbo-1.4-compat.patch
+
 * Thu Dec 10 2015 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.65-11.b17
 - Define our own optimisation flags based on the optflags macro and pass to OpenJDK build cflags/cxxflags.
 - Remove -fno-devirtualize as we are now on GCC 5 where the GCC bug it worked around is fixed.
diff --git a/libjpeg-turbo-1.4-compat.patch b/libjpeg-turbo-1.4-compat.patch
deleted file mode 100644
index 26ffc7b..0000000
--- a/libjpeg-turbo-1.4-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Remove uses of FAR in jpeg code
-
-Upstream libjpeg-trubo removed the (empty) FAR macro:
-http://sourceforge.net/p/libjpeg-turbo/code/1312/
-
-Adjust our code to not use the undefined FAR macro anymore.
-
-diff --git a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-@@ -1385,7 +1385,7 @@
-     /* and fill it in */
-     dst_ptr = icc_data;
-     for (seq_no = first; seq_no < last; seq_no++) {
--        JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-+        JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-         unsigned int length =
-             icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
- 
-diff --git a/src/share/native/sun/awt/image/jpeg/jpegdecoder.c b/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
-+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
-@@ -41,9 +41,8 @@
- #include "jni.h"
- #include "jni_util.h"
- 
--/* undo "system_boolean" hack and undef FAR since we don't use it anyway */
-+/* undo "system_boolean" hack since we don't use it anyway */
- #undef boolean
--#undef FAR
- #include <jpeglib.h>
- #include "jerror.h"
-