diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch
index c395e39..1269980 100644
--- a/0003-Port-to-QDox-2.0.patch
+++ b/0003-Port-to-QDox-2.0.patch
@@ -3,10 +3,10 @@ Date: Tue, 17 Mar 2015 10:59:41 +0100
 Subject: [PATCH] Port to QDox 2.0
 
 
-diff --git a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
+diff --git a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
 index 2351fc870..64cd7edf0 100644
---- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
-+++ b/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
+--- a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
++++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
 @@ -21,6 +21,7 @@ package org.apache.fop.tools;
  
  import java.io.File;
diff --git a/0004-jdk25.patch b/0004-jdk25.patch
new file mode 100644
index 0000000..ab57880
--- /dev/null
+++ b/0004-jdk25.patch
@@ -0,0 +1,23 @@
+--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java
++++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java
+@@ -165,7 +165,7 @@
+             }
+ 
+             bout.write(encode(">>"));
+-        } catch (IOException ioe) {
++        } catch (Exception ioe) {
+             log.error("Ignored I/O exception", ioe);
+         }
+         byte[] bytes = bout.toByteArray();
+--- a/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
++++ b/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
+@@ -263,7 +263,7 @@
+             indexed.add(new PDFName("DeviceGray"));
+             try {
+                 baout.write(blues);
+-            } catch (IOException e) {
++            } catch (Exception e) {
+                 e.printStackTrace();
+             }
+         }  else {
+
diff --git a/fop.spec b/fop.spec
index a5a7cf1..e28f696 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,6 +1,6 @@
 Name:           fop
 Summary:        XSL-driven print formatter
-Version:        2.9
+Version:        2.11
 Release:        %autorelease
 # ASL 1.1:
 # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources
@@ -22,13 +22,15 @@ Source5:        5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg
 Patch1:         0001-Main.patch
 Patch2:         0002-Use-sRGB.icc-color-profile-from-colord-package.patch
 Patch3:         0003-Port-to-QDox-2.0.patch
+Patch4:         0004-jdk25.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Requires:       java
+Requires:       java-25
 Requires:       xalan-j2 >= 2.7.0
 Requires:       xml-commons-apis >= 1.3.04
+BuildRequires:  bouncycastle-pkix
 # Explicit requires for javapackages-tools since fop script
 # uses /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -38,14 +40,15 @@ BuildRequires:  apache-commons-logging
 BuildRequires:  batik
 BuildRequires:  fontbox
 BuildRequires:  gnupg2
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local-openjdk25
 BuildRequires:  junit
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-clean-plugin
-BuildRequires:  maven-local
-BuildRequires:  maven-plugin-build-helper
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  build-helper-maven-plugin
 BuildRequires:  mvn(javax.servlet:servlet-api)
+BuildRequires:  bouncycastle-pkix
 # For servlet, not packaged
 #BuildRequires:  maven-war-plugin
 BuildRequires:  pdfbox
@@ -80,6 +83,8 @@ rm -f fop/lib/*.jar fop/lib/build/*.jar
 
 # Not packaged
 %pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
+%pom_change_dep org.bouncycastle:bcpkix-jdk15to18:1.78.1 org.bouncycastle:bcpkix-jdk18on:1.83 fop-core
+%pom_change_dep org.bouncycastle:bcprov-jdk15to18:1.78.1 org.bouncycastle:bcprov-jdk18on:1.83 fop-core
 %pom_remove_dep javax.media:jai-core fop-core
 %pom_remove_dep com.sun.media:jai-codec fop-core
 %pom_remove_dep net.sf.offo:fop-hyph fop-core
@@ -118,13 +123,14 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %files -f .mfiles
-%doc LICENSE LICENSE-1.1 README NOTICE
+%doc README NOTICE
+%license LICENSE LICENSE-1.1
 %{_datadir}/%{name}
 %{_bindir}/fop
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
-%doc LICENSE LICENSE-1.1
+%license LICENSE LICENSE-1.1
 
 
 %changelog
diff --git a/sources b/sources
index 31b316a..3fb9efc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121
-SHA512 (fop-2.9-src.tar.gz) = d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093
-SHA512 (fop-2.9-src.tar.gz.asc) = 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc
+SHA512 (fop-2.11-src.tar.gz) = 9eacdee6d81ecf5af02c6266d20f55642febfa10bc9f3754cfb4d1532743899759d6bc7d362e80f3a1d8d370c54485e455d0ca3eac8b6604a05d3326ffefa00c
+SHA512 (fop-2.11-src.tar.gz.asc) = b6ec1565abc6386a08e77016b63ec3931f0c67ecb6f7135984c946a20e8bb4030f358270f21fce84614729ec40b48825f478e4cbc2b10972446bee36f5f8474f