Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 0841e371baa24f1cf61f8ce3d998171aa9919de9)
+++ pst/typesetting/texlive.xml	(revision 89b38c1ee4a622ac38faa5b0a607891e853147f6)
@@ -7,14 +7,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        "f98f6bde0a2c20fc894d983d542beaad">
-  <!ENTITY texlive-size          "61 MB">
-
-  <!ENTITY texlive-buildsize      "6.0 GB including the additional download, 4.9 GB installed">
-  <!ENTITY texlive-time           "8.2 SBU including the additional download (+0.3 SBU for the tests)">
+  <!ENTITY texlive-md5sum        "41d1e8874d266935c656fe51b440a413">
+  <!ENTITY texlive-size          "48 MB">
+
+  <!ENTITY texlive-buildsize      "6.5 GB including the additional download (+179 MB for the tests), 5.3 GB installed">
+  <!ENTITY texlive-time           "9.8 SBU including the additional download (+0.3 SBU for the tests)">
 
   <!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        "44bb5d71fc64ac90118f8c5013e39b89">
-  <!ENTITY texlive-texmf-size          "2.3 GB">
+  <!ENTITY texlive-texmf-md5sum        "05330b3b5445ef60b08a0ed660c55c92">
+  <!ENTITY texlive-texmf-size          "2.5 GB">
 
 ]>
@@ -104,17 +104,5 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-source-gcc7-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-source-upstream_fixes-2.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-source-poppler059-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-texmf-upstream_fixes-1.patch"/></para>
+        url="&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -181,7 +169,8 @@
 <screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 
-patch -Np1 -i ../texlive-&texlive-version;-source-gcc7-1.patch           &amp;&amp;
-patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-2.patch &amp;&amp;
-patch -Np1 -i ../texlive-&texlive-version;-source-poppler059-1.patch     &amp;&amp;
+patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
+
+mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc &amp;&amp;
+mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc  &amp;&amp;
 
 mkdir texlive-build &amp;&amp;
@@ -211,4 +200,5 @@
     --with-system-pixman                                        \
     --with-system-poppler                                       \
+    --with-system-potrace                                       \
     --with-system-xpdf                                          \
     --with-system-zlib                                          \
@@ -224,4 +214,6 @@
     user:</para>
 
+<!-- Editors, you can run 'make texlinks' in a DESTDIR by passing
+DESTDIR#some/where -->
 <screen role="root"><userinput>make install-strip &amp;&amp;
 /sbin/ldconfig &amp;&amp;
@@ -243,8 +235,5 @@
 <!-- if texmf does not need to be patched, remove &amp;&amp; from first line,
  close userinput, screen, comment pushd, patch, popd -->
-<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1 &amp;&amp;
-pushd /opt/texlive/&texlive-year; &amp;&amp;
-patch -Np1 -i /sources/texlive-&texlive-version;-texmf-upstream_fixes-1.patch &amp;&amp;
-popd</userinput></screen>
+<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
 
     <para>Still as the <systemitem class="username">root</systemitem> user,
@@ -253,4 +242,8 @@
     <emphasis>lot</emphasis> of output):</para>
 
+<!-- Editors, fmtutil-sys and mtxrun \-\-generate can apparently only be run on
+a real install, as root.  But mktexlsr can be run in a DESTDIR with
+cd /YOUR/TEXMF/ROOT ; ls -LAR ./ >ls-R -->
+
 <screen role="root"><userinput>mktexlsr &amp;&amp;
 fmtutil-sys --all &amp;&amp;
@@ -265,4 +258,18 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <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. In particular, a segmentation fault in dvipdfm-x from
+      XeTeX and changes in upstream poppler-0.64.0.
+    </para>
+
+    <para>
+      <command>mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc ...</command>:
+      The &texlive-year; version of texlive ships with support for poppler-0.57.0
+      and older, but it includes alternative newpoppler files which enable building
+      with poppler-0.62.0 or newer.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -305,13 +312,4 @@
       of its size we do not want to waste time and space untarring it and then
       copying the files.
-    </para>
-
-    <para>
-      <command>patch -Np1 -i /sources/texlive-&texlive-version;-texmf...</command>:
-      This fixes various problems with the UKenglish and USenglish variants of
-      babel which were found after the source was released are included in the
-      binary installer.  Because this is
-      applied to the installated texmf (to minimise disk space) it is necessary
-      to point to /sources instead of using  ../
     </para>
 
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 0841e371baa24f1cf61f8ce3d998171aa9919de9)
+++ pst/typesetting/tl-installer.xml	(revision 89b38c1ee4a622ac38faa5b0a607891e853147f6)
@@ -8,9 +8,9 @@
 
   <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "8f8fc301514c08a89a2e97197369c648">
-  <!ENTITY tl-installer-date             "20170524"> <!-- in the directory name -->
-  <!ENTITY tl-installer-size            "3.9 MB">
-
-  <!ENTITY tl-installer-buildsize        "4.9 GB if everything is included">
+  <!ENTITY tl-installer-md5sum          "3a1ab4e0ed369f2a58e52184636ac0df">
+  <!ENTITY tl-installer-date             "20180428"> <!-- in the directory name -->
+  <!ENTITY tl-installer-size            "2.7 MB">
+
+  <!ENTITY tl-installer-buildsize        "5.5 GB if everything is included">
   <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
 ]>
