Index: general.ent
===================================================================
--- general.ent	(revision 8c03e975bd30d68b0f4b8955a6597c945527832a)
+++ general.ent	(revision 6f6f731196570d85efcd9307b3a3175a7a73f2d1)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 16th, &year;">
+<!ENTITY releasedate  "May 17th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8c03e975bd30d68b0f4b8955a6597c945527832a)
+++ introduction/welcome/changelog.xml	(revision 6f6f731196570d85efcd9307b3a3175a7a73f2d1)
@@ -43,4 +43,14 @@
     -->
     <listitem>
+      <para>May 17th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to fop-2.5. Fixes
+          <ulink url="&blfs-ticket-root;13534">#13534</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 16th, 2020</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 8c03e975bd30d68b0f4b8955a6597c945527832a)
+++ packages.ent	(revision 6f6f731196570d85efcd9307b3a3175a7a73f2d1)
@@ -1062,5 +1062,5 @@
 <!ENTITY psutils-version              "p17">
 <!ENTITY epdfview-version             "0.1.8">
-<!ENTITY fop-version                  "2.4">
+<!ENTITY fop-version                  "2.5">
 <!ENTITY mupdf-version                "1.17.0">
 <!ENTITY paps-version                 "0.7.1">
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision 8c03e975bd30d68b0f4b8955a6597c945527832a)
+++ pst/ps/fop.xml	(revision 6f6f731196570d85efcd9307b3a3175a7a73f2d1)
@@ -7,7 +7,7 @@
   <!ENTITY fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
   <!ENTITY fop-download-ftp  " ">
-  <!ENTITY fop-md5sum        "e379d5916bc705b6fd3808a77f5d8478">
+  <!ENTITY fop-md5sum        "5e7e87ef12845d31bce7a1fe8d61f501">
   <!ENTITY fop-size          "26 MB">
-  <!ENTITY fop-buildsize     "252 MB ">
+  <!ENTITY fop-buildsize     "491 MB ">
   <!ENTITY fop-time          "0.4 SBU">
 
@@ -20,4 +20,10 @@
   <!ENTITY fontbox-md5sum    "74b3b8ee7eef40b0aff5ca5aa07d96f7">
   <!ENTITY fontbox-size      "1.5 MB">
+
+  <!ENTITY maven-major        "3">
+  <!ENTITY maven-version      "3.6.3">
+  <!ENTITY maven-download     "http://mirror.reverse.net/pub/apache/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
+  <!ENTITY maven-md5sum       "9792c717f5845d952907d5144b8253c3">
+  <!ENTITY maven-size         "9 MB (additionally, about 100 MB are downloaded to the building user's directory)">
 
   <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
@@ -112,4 +118,14 @@
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Maven build system:
+          <simplelist>
+            <member><ulink url="&maven-download;"/></member>
+            <member>&maven-md5sum;</member>
+            <member>&maven-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
     </itemizedlist>
 
@@ -139,5 +155,5 @@
 <!-- Included into ant      <xref linkend="junit"/> (to run tests),-->
       <xref linkend="x-window-system"/> (to run tests),
-<!--      <xref linkend="maven"/> (an alternate build system), not funcional
+<!--      <xref linkend="maven"/> (an alternate build system), not functional
       with fop-2.3          -->
       <ulink url="http://jai-tools.blogspot.com/">JAI Image I/O Tools</ulink>, and
@@ -145,5 +161,5 @@
 <!-- [pierre 2017-04-29] Note to devs: there are a lot of bundled dependencies.
      Some were listed here, but not all. I am not sure it is possible to
-     use system ones. So, I have removed them, an kept only those which
+     use system ones. So, I have removed them, and kept only those which
      are not bundled. -->
     </para>
@@ -176,4 +192,16 @@
 cp offo-hyphenation/hyph/* fop/hyph &amp;&amp;
 rm -rf offo-hyphenation</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Installing a temporary Maven binary</title>
+
+      <para>
+        Starting with fop-2.5, the Maven build system is required. We use
+        the binary provided by apache, that we install in a temporary location:
+      </para>
+
+<screen><userinput>tar -xf ../apache-maven-&maven-version;-bin.tar.gz -C /tmp</userinput></screen>
 
     </sect3>
@@ -206,12 +234,4 @@
 
       <para>
-        With <xref linkend="openjdk"/>, the minimum source version is 1.7,
-        while <application>FOP</application> build system has 1.6. Change that:
-      </para>
-
-<screen><userinput>sed -e 's/1\.6/1.7/' \
-    -i fop/build.xml</userinput></screen>
-
-      <para>
         The <filename>build.xml</filename> file calls for an old version of
         <application>PDFBox</application> components that are no longer
@@ -226,12 +246,15 @@
       </para>
 
-<screen><userinput>cd fop                    &amp;&amp;
-export LC_ALL=en_US.UTF-8 &amp;&amp;
-ant all javadocs          &amp;&amp;
+<screen><userinput>cd fop &amp;&amp;
+
+LC_ALL=en_US.UTF-8                     \
+PATH=$PATH:/tmp/apache-maven-&maven-version;/bin \
+ant all javadocs &amp;&amp;
+
 mv build/javadocs .</userinput></screen>
 
       <para>
-        The <application>junit</application> test suite was run as part of the
-        above commands.
+        This package comes with a testsuite, but the java infrastructure
+        installed in this book does not allow running it.
       </para>
  
@@ -245,4 +268,10 @@
 chmod a+x /opt/fop-&fop-version;/fop                                &amp;&amp;
 ln -v -sfn fop-&fop-version; /opt/fop</userinput></screen>
+
+      <para>
+        The last thing to do is to clean what we have done:
+      </para>
+
+<screen><userinput>rm -rf /tmp/apache-maven-&maven-version;</userinput></screen>
 
     </sect3>
@@ -411,6 +440,6 @@
           <para>
             is a wrapper script to the <command>java</command> command
-          which sets up the <application>fop</application>
-          environment and passes the required parameters.
+            which sets up the <application>fop</application>
+            environment and passes the required parameters.
           </para>
           <indexterm zone="fop fop-prog">
