Index: general.ent
===================================================================
--- general.ent	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ general.ent	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 11th, &year;">
+<!ENTITY releasedate  "April 12th, &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 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ introduction/welcome/changelog.xml	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -43,4 +43,14 @@
     -->
     <listitem>
+      <para>April 12th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to texlive-20200406. Fixes
+          <ulink url="&blfs-ticket-root;13394">#13394</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 11th, 2020</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ packages.ent	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -1065,10 +1065,10 @@
 
 <!-- Chapter 51 -->
-<!ENTITY texlive-version              "20190410">
-<!ENTITY texmf-version                "20190410">
+<!ENTITY texlive-version              "20200406">
+<!ENTITY texmf-version                "20200406">
 <!-- the year is used when setting up PATHs in the tl-installer
  page, as well as to reference the directory in texlive, also
  in asymptote, biber and xindy -->
-<!ENTITY texlive-year                 "2019">
+<!ENTITY texlive-year                 "2020">
 <!ENTITY asymptote-version            "2.65">
 <!ENTITY biber-version                "2.14">
Index: pst/typesetting/tex-path.xml
===================================================================
--- pst/typesetting/tex-path.xml	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ pst/typesetting/tex-path.xml	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -25,4 +25,14 @@
     always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
   </para>
+
+  <note>
+    <para>
+      If upgrading from a previous year's version, you should manually
+      edit <filename>extrapaths.sh</filename> to ensure that the version for
+      the year you wish to use is the only TeX present (some people need to
+      keep multiple years available to ensure there are no regressions in
+      their documents).
+    </para>
+  </note>
 
 <!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ pst/typesetting/texlive.xml	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -1,3 +1,2 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -7,14 +6,14 @@
   <!ENTITY texlive-download-http " ">
   <!ENTITY texlive-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-md5sum        "be4b20aa60861bc510bcbc5b228bcb51">
-  <!ENTITY texlive-size          "52 MB">
-
-  <!ENTITY texlive-buildsize      "7.2 GB including the additional download and the tests, 6.0 GB installed">
-  <!ENTITY texlive-time           "5.6 SBU including the additional download and the tests, building with parallelism=4">
+  <!ENTITY texlive-md5sum        "a5d992e3cb8554ce92c55adde03958ba">
+  <!ENTITY texlive-size          "53 MB">
+
+  <!ENTITY texlive-buildsize      "8.5 GB including the additional download and the tests, 6.4 GB installed">
+  <!ENTITY texlive-time           "5.8 SBU including the additional download and the tests, building with parallelism=4">
 
   <!ENTITY texlive-texmf-download-http " ">
   <!ENTITY texlive-texmf-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texmf-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-md5sum        "586bb6cb6c30ce7efba256b956df6bc2">
-  <!ENTITY texlive-texmf-size          "2.5 GB">
+  <!ENTITY texlive-texmf-md5sum        "bca40df2ff11269fbcb2d1b4ff0278b1">
+  <!ENTITY texlive-texmf-size          "3.0 GB">
 
 ]>
@@ -46,7 +45,12 @@
       if TeX has not already been installed. Additionally,
       <application>biber</application> is not provided within the
-      <application>texlive</application> source.
-    </para>
-
+      <application>texlive</application> source and the version of
+      <application>dvisvgm</application> in the
+      <application>texlive</application> tree cannot be built
+      if shared system libraries are used.
+    </para>
+
+      <para>
+      </para>
     <para>
       All of those packages are dealt with on their own pages and can be
@@ -130,10 +134,10 @@
         </para>
       </listitem>
-      <listitem>
+<!--  <listitem>
         <para>
           Required patch: <ulink url=
           "&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
@@ -182,4 +186,26 @@
     </para>
 
+    <caution>
+      <para>
+        The instructions here for dealing with <application>poppler</application>
+        will only work with versions of poppler used in BLFS-9.1 and later, i.e.
+        poppler &gt;= 0.83.0. If you wish to upgrade an older system, there
+        are versions of <filename>pdftoepdf{,-poppler*}.cc</filename> and
+        <filename>pdftosrc{,-newpoppler,-poppler*}.cc</filename> in <filename
+        class="directory">texk/web2c/pdftexdir</filename>. You should establish
+        which version of <application>poppler</application> is installed and use
+        the appropriate versions of these files.
+      </para>
+
+      <para>
+        Similarly, if you wish to upgrade to current <application>texlive</application>
+        on an older system where extra packages (<application>asymptote</application>.
+        <application>biber</application>, <application>dvisvgm</application> or
+        <application>xindy</application>) have been installed, you will need to
+        reinstall those as well as fixing up your <literal>PATH</literal> for
+        <literal>/opt/texlive/&texlive-year;</literal>.
+      </para>
+    </caution>
+
     <para>
       The shared libraries will be installed into a texlive directory.
@@ -196,16 +222,38 @@
 EOF</userinput></screen>
 
+    <para>
+      <application>TexLive</application> ships with a very old version of
+      <application>poppler</application>, and some updated files for newer versions.
+      To use the system version, first identify it and then copy the correct
+      versions of the updated files (please read the Caution above):
+    </para>
+
+<!-- on a release, drop this back to current version but update the
+ Caution above and ideally keep this commented, every other (expletive
+ deleted) poppler update tends to break this. -->
+<screen><userinput>SYSPOP= &amp;&amp;
+let MYPOPPLER=$(pkg-config --modversion poppler | cut -d '.' -f2)
+if [ "$MYPOPPLER" -lt 85 ]; then
+    # BLFS-9.1 uses 0.85.0, ignore earlier versions in this script.
+    SYSPOP=
+else
+    SYSPOP="--with-system-poppler --with-system-xpdf --with-system-potrace"
+    if [ $MYPOPPLER -lt 86 ]; then
+        mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.83.0,}.cc
+    else # 0.86.0 or later.
+        mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
+    fi
+    # For pdftosrc BLFS-9.1 uses 0.83.0 and that is the latest variant.
+    mv -v texk/web2c/pdftexdir/pdftosrc{-poppler0.83.0,}.cc
+fi &amp;&amp;
+export SYSPOP &amp;&amp;
+unset MYPOPPLER</userinput></screen>
+
     <note>
       <para>
-        From 2015 onwards, a successful install requires some texlive
+        A successful install requires some texlive
         commands to be run as the root user, so we will export the TEXARCH
         variable to let <systemitem class="username">root</systemitem> use it.
       </para>
-
-      <para>
-        In the 2019 release, <application>dvisvgm</application> cannot be built
-        if shared system libraries are used. This means that
-        <xref linkend="asymptote"/> will not be able to create svg files.
-      </para>
     </note>
 
@@ -213,16 +261,11 @@
       Now, as a normal user:
     </para>
+<!-- after the export!
+patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;-->
 <screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
 
 mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
-<!-- 
-    \-\-with-system-poppler                                       \
-    \-\-with-system-xpdf                                          \
-    potrace was only used by dvisvgm
-    \-\-with-system-potrace                                       \
- -->
+
 ../configure                                                    \
     --prefix=/opt/texlive/&texlive-year;                                  \
@@ -248,13 +291,16 @@
     --with-system-mpfr                                          \
     --with-system-pixman                                        \
+    ${SYSPOP}                                                   \
     --with-system-zlib                                          \
     --with-banner-add=" - BLFS" &amp;&amp;
 
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>
-      A few tests may SKIP because kpathsea
-      has not yet been installed.
+make &amp;&amp;
+unset SYSPOP</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>.
+      One of the Kpathsea tests will fail because BLFS uses system
+      libraries.
+   <!--  https://tug.org/pipermail/tex-k/2019-August/003036.html -->
     </para>
 
@@ -305,6 +351,6 @@
     <para>
       You can now proceed to <xref linkend="asymptote"/>,
-      <xref linkend="biber"/> and / or <xref linkend="xindy"/> if you
-      wish to install them.
+      <xref linkend="biber"/>, <xref linkend="dvisvgm"/> and / or <xref
+      linkend="xindy"/> if you wish to install them.
     </para>
 
@@ -314,17 +360,8 @@
     <title>Command Explanations</title>
 
-    <para>
+<!--<para>
       <command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch</command>:
       various problems have come to light since the shipped source was frozen to
       be committed to DVDs.
-    </para>
-
-<!--
-    <para>
-      <command>let MYPOPPLER=...</command>: Because the vulnerability fix applies to
-      many past years of <application>texlive</application>, the tests aim to allow
-      updating using system versions of poppler since 0.62.0. The amended files for
-      newer versions of poppler need to be copied over the original versions,
-      depending on which version is being used.
     </para>-->
 
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ pst/typesetting/tl-installer.xml	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -8,9 +8,9 @@
 
   <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "e80f92667fb65f38dae88d1c5b22dba3">
-  <!ENTITY tl-installer-date             "20190529"> <!-- in the directory name -->
+  <!ENTITY tl-installer-md5sum          "769eb3849f931ca3efcbeeca093b95c0">
+  <!ENTITY tl-installer-date             "20200406"> <!-- in the directory name -->
   <!ENTITY tl-installer-size            "3.8 MB">
 
-  <!ENTITY tl-installer-buildsize        "6.7 GB if everything is included">
+  <!ENTITY tl-installer-buildsize        "6.6 GB if everything is included">
   <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
 ]>
Index: xincludes/texrecommendlibs.xml
===================================================================
--- xincludes/texrecommendlibs.xml	(revision 476eb4bdec2afe5482746f4e105937f86b7aac3b)
+++ xincludes/texrecommendlibs.xml	(revision 26e88246f28fce2355ca80a279e58d46207fa1d5)
@@ -18,6 +18,7 @@
   <xref linkend="icu"/>,
   <xref linkend="libpaper"/> (used by at least context and xelatex),
-   and <xref linkend="libpng"/>
-  <!--<xref linkend="poppler"/>,-->
-  <!-- and <xref linkend="potrace"/>-->
+   and <xref linkend="libpng"/>, also
+  <xref linkend="poppler"/> and
+  <xref linkend="potrace"/> (both only used if suitable file versions
+  are available in <filename class="directory">texk/web2c/pdftexdir</filename>)
 </para>
