Index: general.ent
===================================================================
--- general.ent	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ general.ent	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2021">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 21st, &year;">
+<!ENTITY releasedate  "January 22nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ general/prog/java.xml	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -8,15 +8,15 @@
     the directory: this saves more than 70 MB. -->
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-14.0.1/OpenJDK-14.0.1+7-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "03bea53f017e53d64811c24a794368e0">
-  <!ENTITY openjdk-bin-size-x86        "109 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "242 MB">
+  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-15.0.2/OpenJDK-15.0.2+7-i686-bin.tar.xz">
+  <!ENTITY openjdk-bin-md5sum-x86      "8093b7f2d38fbfc39c63abd57462315b">
+  <!ENTITY openjdk-bin-size-x86        "148 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "281 MB">
 
 <!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
      licence.-->
-  <!ENTITY openjdk-download-binary-x64 "https://download.java.net/java/GA/jdk14.0.1/664493ef4a6946b186ff29eb326336a2/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
-  <!ENTITY openjdk-bin-md5sum-x64      "8b402feab7c615367b21e289ddda665e">
-  <!ENTITY openjdk-bin-size-x64        "189 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "320 MB">
+  <!ENTITY openjdk-download-binary-x64 "https://download.java.net/java/GA/jdk&openjdk-version;/0d1cfde4252546c6931946de8db48ee2/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
+  <!ENTITY openjdk-bin-md5sum-x64      "9209edbd74358ccb1c54cf54004f0bb9">
+  <!ENTITY openjdk-bin-size-x64        "186 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "321 MB">
 ]>
 
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ general/prog/openjdk.xml	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -5,20 +5,20 @@
   %general-entities;
 
-  <!ENTITY ojdk-tarball              "jdk-&openjdk-version;+&openjdk-build;.tar.bz2">
-  <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk-updates/jdk14u">
+  <!ENTITY ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
+  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk15u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "bf287746bb1be5e0d94c27e3d79d800e">
-  <!ENTITY ojdk-size                 "80 MB">
-
-  <!ENTITY jtreg-version             "4.2-b13-517">
+  <!ENTITY ojdk-md5sum               "e516e5e14ded6f91a89c9b4c83a87005">
+  <!ENTITY ojdk-size                 "97 MB">
+
+  <!ENTITY jtreg-version             "4.2.0-tip">
   <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
-  <!ENTITY jtreg-md5sum              "ffcef8f1caa5c22f4d006fb82e074de4">
-  <!ENTITY jtreg-size                "6.8 MB">
-
-  <!ENTITY ojdk-bdsize               "5.3 GB (an additional 394 MB for tests)">
-  <!ENTITY ojdk-time                 "4.5 SBU with 4 jobs (an additional 51 SBU for tests with 4 jobs)">
+  <!ENTITY jtreg-md5sum              "11818f2ae4be19d2c7ae6501be60ee98">
+  <!ENTITY jtreg-size                "6.9 MB">
+
+  <!ENTITY ojdk-bdsize               "4.5 GB (add 399 MB for tests)">
+  <!ENTITY ojdk-time                 "4.5 SBU with 4 jobs (add 55 SBU for tests with 4 jobs)">
 ]>
 
@@ -153,5 +153,5 @@
       </listitem>
     </itemizedlist>
-
+<!-- 
     <bridgehead renderas="sect4">Required patch</bridgehead>
 
@@ -163,5 +163,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
 
@@ -194,7 +194,8 @@
       <xref linkend="git"/>,
       <xref linkend="graphviz"/>,
-      <xref linkend="mercurial"/>,
+      <xref linkend="mercurial"/>, and
+<!-- not needed now, it seems
       an X Window manager such as <xref linkend="twm"/> (for the tests), and
-      <ulink url="https://pandoc.org/">pandoc</ulink>
+-->   <ulink url="https://pandoc.org/">pandoc</ulink>
     </para>
 
@@ -212,5 +213,5 @@
 
 <screen><userinput>tar -xf ../jtreg-&jtreg-version;.tar.gz</userinput></screen>
-
+<!--
     <para>
       Apply a patch to allow building with make-4.3:
@@ -225,5 +226,5 @@
 <screen><userinput>sed -i /sysctl/d \
     src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp</userinput></screen>
-
+-->
     <note>
       <para>
@@ -238,7 +239,7 @@
 
       <para>
-        The build system does not support the <option>-j</option> switch in
+        The build system does not allow the <option>-j</option> switch in
         <envar>MAKEFLAGS</envar>. See the command explanation for
-        <option>--with-jobs=</option> and <option>--with-test-jobs=</option>
+        <option>--with-jobs=</option>
         for more information on customizing parallelization.
       </para>
@@ -252,5 +253,4 @@
 <screen><userinput>unset JAVA_HOME                                       &amp;&amp;
 bash configure --enable-unlimited-crypto              \
-               --with-extra-cflags="$CFLAGS -fcommon" \
                --disable-warnings-as-errors           \
                --with-stdc++lib=dynamic               \
@@ -371,11 +371,10 @@
       It is not executable and must be run through <command>bash</command>.
     </para>
-
-    <para>
-      <parameter>--with-extra-cflags=-fcommon</parameter>: Allows building
+<!-- Not needed in openjdk-15
+    <para>
+      <parameter>- -with-extra-cflags=-fcommon</parameter>: Allows building
       with GCC 10.
-      <!-- patchs are available upstream and will be included in java 15 -->
-    </para>
-
+    </para>
+-->
     <para>
       <parameter>--enable-unlimited-crypto</parameter>: Because of limitations
@@ -447,10 +446,10 @@
       not needed if <command>java</command> is found in the <envar>PATH</envar>.
     </para>
-
+<!-- Seems to have disappeared
     <para>
       <command>find ... -iname '*.diz' -delete</command>: This command
       removes redundant files.
     </para>
-
+-->
   </sect2>
 
@@ -521,7 +520,7 @@
       <seglistitem>
         <seg>jaotc, jar, jarsigner, java, javac, javadoc, javap, jcmd,
-        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo, jjs,
+        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo,
 	jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
-	jstat, jstatd, keytool, rmic, rmid, rmiregistry, and serialver</seg>
+	jstat, jstatd, keytool, rmid, rmiregistry, and serialver</seg>
         <seg>/opt/jdk-&openjdk-version;/lib/*</seg>
         <seg>/opt/jdk-&openjdk-version;</seg>
@@ -739,5 +738,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="jjs">
         <term><command>jjs</command></term>
@@ -753,5 +752,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="jlink">
         <term><command>jlink</command></term>
@@ -903,5 +902,5 @@
         </listitem>
       </varlistentry>
-      -->
+
       <varlistentry id="rmic">
         <term><command>rmic</command></term>
@@ -917,5 +916,5 @@
         </listitem>
       </varlistentry>
-
+      -->
       <varlistentry id="rmid">
         <term><command>rmid</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ introduction/welcome/changelog.xml	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -43,4 +43,17 @@
     -->
     <listitem>
+      <para>January 22nd, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to fop-2.6. Fixes
+          <ulink url="&blfs-ticket-root;14542">#14542</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to OpenJDK-15.0.2. Fixes
+          <ulink url="&blfs-ticket-root;14536">#14536</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>January 21st, 2021</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ packages.ent	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -386,5 +386,5 @@
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "14.0.1">
+<!ENTITY openjdk-version              "15.0.2">
 <!ENTITY openjdk-build                "7">
 
@@ -1078,5 +1078,5 @@
 <!ENTITY psutils-version              "p17">
 <!ENTITY epdfview-version             "0.1.8">
-<!ENTITY fop-version                  "2.5">
+<!ENTITY fop-version                  "2.6">
 <!ENTITY mupdf-version                "1.18.0">
 <!ENTITY paps-version                 "0.7.1">
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision b9f03437323700eda26de75f89b58808891afec9)
+++ pst/ps/fop.xml	(revision 5b5d604bf977befa1231b68ed1b55545b490046d)
@@ -7,23 +7,23 @@
   <!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        "5e7e87ef12845d31bce7a1fe8d61f501">
+  <!ENTITY fop-md5sum        "1d6bc84d2ab7f971bbc628080e3c307f">
   <!ENTITY fop-size          "26 MB">
-  <!ENTITY fop-buildsize     "491 MB ">
+  <!ENTITY fop-buildsize     "522 MB (including files downloaded to the user directory)">
   <!ENTITY fop-time          "0.4 SBU">
 
-  <!ENTITY pdfbox-version    "2.0.21">
-  <!ENTITY pdfbox-download   "http://mirror.reverse.net/pub/apache/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
-  <!ENTITY pdfbox-md5sum     "aa28f5d7a9a89bb46391643315d5307b">
+  <!ENTITY pdfbox-version    "2.0.22">
+  <!ENTITY pdfbox-download   "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
+  <!ENTITY pdfbox-md5sum     "7de0d7e4c89e5e07d0298ca112907921">
   <!ENTITY pdfbox-size       "2.6 MB">
 
-  <!ENTITY fontbox-download  "http://mirror.reverse.net/pub/apache/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
-  <!ENTITY fontbox-md5sum    "5840ff3bcc1e2ea1d066b7f0114c359b">
+  <!ENTITY fontbox-download  "http://archive.apache.org/dist/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
+  <!ENTITY fontbox-md5sum    "dba672a1fa1386423d94aced4b573e22">
   <!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-download     "http://archive.apache.org/dist/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 maven-size         "9.1 MB (additionally, about 82 MB are downloaded to the building user's directory)">
 
   <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
@@ -129,10 +129,10 @@
       </listitem>
     </itemizedlist>
-
+<!-- Using the archive above allows finding all versions
     <note><para>
       The pdfbox and fontbox packages may not be available at the above 
       location.  If not, they can be found at the BLFS files mirror sites.
     </para></note>
-
+-->
     <itemizedlist spacing="compact">
       <title>Recommended packages</title>
@@ -229,5 +229,5 @@
 &lt;arg value="--ignore-source-errors"/&gt;' \
     fop/build.xml</userinput></screen>
-
+<!-- Seems to have been fixed in 2.6
       <para>
         The stack size set in <filename>build.xml</filename> for building the
@@ -237,5 +237,5 @@
 <screen><userinput>sed -e '/hyph\.stack/s/512k/1M/' \
     -i fop/build.xml</userinput></screen>
-
+-->
       <para>
         The <filename>build.xml</filename> file calls for an old version of
