Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 767b699fe77ba405451b2028e529dc86683e6e6d)
+++ pst/typesetting/texlive.xml	(revision adfe27c281971837344511ead24344c04d53d613)
@@ -7,6 +7,6 @@
   <!ENTITY texlive-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
   <!ENTITY texlive-download-ftp  " ">
-  <!ENTITY texlive-md5sum        "bec84c5d6e340967783302f432c78efe">
-  <!ENTITY texlive-size          "66 MB">
+  <!ENTITY texlive-md5sum        "1da2f08e3ba4a3708870dd088c1d6823">
+  <!ENTITY texlive-size          "67 MB">
 
   <!ENTITY texlive-buildsize      "8.5 GB including the additional download and the tests, 7.7 GB installed">
@@ -16,11 +16,11 @@
   <!ENTITY texlive-texmf-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-texmf.tar.xz">
   <!ENTITY texlive-texmf-download-ftp  " ">
-  <!ENTITY texlive-texmf-md5sum        "704fb39c69e3710b8e9e9158cec5047a">
-  <!ENTITY texlive-texmf-size          "3.7 GB">
-
-  <!ENTITY texlive-tlpdb-download-http "https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/&texlive-year;/texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz">
-  <!ENTITY texlive-tlpdb-download-ftp  " ">
-  <!ENTITY texlive-tlpdb-md5sum        "5078a7ddaa7b309b7392e33916b817f7">
-  <!ENTITY texlive-tlpdb-size          "3.2 MB">
+  <!ENTITY texlive-texmf-md5sum        "e67ce334dd0fddda5f4a87b4fcaaf48f">
+  <!ENTITY texlive-texmf-size          "4.0 GB">
+
+  <!ENTITY texlive-extra-download-http "https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-extra.tar.xz">
+  <!ENTITY texlive-extra-download-ftp  " ">
+  <!ENTITY texlive-extra-md5sum        "1bd045bd1673ce61bde590c10b86c6cc">
+  <!ENTITY texlive-extra-size          "1.9 MB">
 
 ]>
@@ -153,8 +153,7 @@
 
       <para>
-        From the 2019 year, the tlpdb database of the packages within texlive is
-        no-longer installed with the source. But <command>texdoc</command> needs
-        a cache file derived from this (and will create the cache on its first
-        run).
+        The tlpdb database is shipped as a separate tarball. The
+        <command>texdoc</command> program needs a cache file derived
+        from this (and will create the cache on its first run).
       </para>
 
@@ -162,29 +161,29 @@
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&texlive-tlpdb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-tlpdb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-tlpdb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-tlpdb-size;
-        </para>
-      </listitem>
-
-      <listitem>
+          Download (HTTP): <ulink url="&texlive-extra-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&texlive-extra-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &texlive-extra-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &texlive-extra-size;
+        </para>
+      </listitem>
+
+<!--  <listitem>
         <para>
           Required patch: <ulink url=
           "&patch-root;/texlive-&texlive-version;-source-security_fix-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
@@ -249,7 +248,8 @@
     </para>
 
+<!-- if a patch for the source is needed, this should go between the export
+	ande configure. But keeping it there as a commented line adds too much vertical space.
+    patch -Np1 -i ../texlive-&texlive-version;-source-security_fix-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-security_fix-1.patch &amp;&amp;
 
 mkdir texlive-build &amp;&amp;
@@ -306,5 +306,5 @@
 mkdir -pv                                $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
 install -v -m644 ../texk/tests/TeXLive/* $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
-tar -xf ../../texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz -C $TEXLIVE_PREFIX/tlpkg</userinput></screen>
+tar -xf ../../texlive-&texlive-version;-extra.tar.xz -C $TEXLIVE_PREFIX/tlpkg</userinput></screen>
 
     <note>
