Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ introduction/welcome/changelog.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -48,4 +48,8 @@
       <para>June 24th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to 2015 texlive. Fixes
+          <ulink url="&blfs-ticket-root;6600">#6600</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to epiphany-3.16.2.  Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ packages.ent	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -600,5 +600,4 @@
 
 <!-- Chapter 36 -->
-<!ENTITY asymptote-version            "2.35">
 <!ENTITY balsa-version                "2.5.2">
 <!ENTITY ekiga-version                "4.0.1">
@@ -757,9 +756,11 @@
 
 <!-- Chapter 47 -->
-<!ENTITY texlive-version              "20140525">
+<!ENTITY texlive-version              "20150521">
+<!ENTITY texmf-version                "20150523">
 <!-- 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 (above) and xindy -->
-<!ENTITY texlive-year                 "2014">
+ in asymptote, biber and xindy -->
+<!ENTITY texlive-year                 "2015">
+<!ENTITY asymptote-version            "2.35">
 <!ENTITY biber-version                "2.1a">
 <!ENTITY biblatex-version             "3.0">
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ pst/typesetting/asymptote.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -36,5 +36,5 @@
     </para>
 
-    &gcc5_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ pst/typesetting/texlive.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -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        "09ee265ff51637827559affc7304078c">
-  <!ENTITY texlive-size          "40 MB">
-
-  <!ENTITY texlive-buildsize      "3.6 GB including the additional download">
-  <!ENTITY texlive-time           "8.2 SBU including the additional download">
+  <!ENTITY texlive-md5sum        "e526bd57118c4c4d5e9d525d20b5ac02">
+  <!ENTITY texlive-size          "44 MB">
+
+  <!ENTITY texlive-buildsize      "4.0 GB including the additional download">
+  <!ENTITY texlive-time           "7.2 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-&texlive-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-md5sum        "645a6f1d3a0ef4a9c279dae02588eab7">
-  <!ENTITY texlive-texmf-size          "1.7 GB">
+  <!ENTITY texlive-texmf-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texmf-version;-texmf.tar.xz">
+  <!ENTITY texlive-texmf-md5sum        "488c1e36ab42841b122cfd074ac42fa1">
+  <!ENTITY texlive-texmf-size          "1.8 GB">
 
 ]>
@@ -138,7 +138,28 @@
     </para>
 
-<!-- the configure switches should be identical to those in the
- first part of texlive itself -->
-<screen><userinput>TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
+    <para>The shared libraries will be installed into a texlive directory.
+    As the <systemitem class="username">root</systemitem> user, add it to
+    your <filename>/etc/ld.so.conf</filename>:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
+<literal># Begin texlive &texlive-year; addition
+
+/opt/texlive/&texlive-year;/lib
+
+# End texlive &texlive-year; addition</literal>
+EOF</userinput></screen>
+
+    <note>
+      <para>
+        From 2015 onwards, 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>
+    </note>
+
+    <para>
+      Now, as a normal user:
+    </para>
+<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
@@ -148,7 +169,7 @@
     --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
     --datarootdir=/opt/texlive/&texlive-year;                 \
-    --includedir=/usr/include                       \
+    --includedir=/opt/texlive/&texlive-year;/include          \
     --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
-    --libdir=/usr/lib                               \
+    --libdir=/opt/texlive/&texlive-year;/lib                  \
     --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
     --disable-native-texlive-build                  \
@@ -157,4 +178,5 @@
     --with-system-fontconfig                        \
     --with-system-freetype2                         \
+    --with-system-gmp                               \
     --with-system-graphite2                         \
     --with-system-harfbuzz                          \
@@ -163,4 +185,5 @@
     --with-system-libpaper                          \
     --with-system-libpng                            \
+    --with-system-mpfr                              \
     --with-system-pixman                            \
     --with-system-poppler                           \
@@ -168,9 +191,8 @@
     --with-system-zlib                              \
     --with-banner-add=" - BLFS" &amp;&amp;
-unset TEXARCH &amp;&amp;
 
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make -k check</command>
+    <para>To test the results, issue: <command>make check</command>
     One test in each of web2c, dvipng and ttf2pk2 will SKIP because kpathsea
     has not yet been installed.</para>
@@ -179,16 +201,38 @@
     user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install-strip &amp;&amp;
 make texlinks</userinput></screen>
 
-    <para>And now, install the additional files as the
+    <note>
+      <para>
+        Only run <command>make texlinks</command> once. If it is rerun,
+        it can change all the program symlinks so that they point to
+        themselves and are useless.
+      </para>
+    </note>
+
+    <para>Now install the additional files as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>mkdir -pv /opt/texlive/&texlive-year; &amp;&amp;
-tar -xf ../../texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</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,
+    ensure that the programs will be able to find <filename
+    class="libraryfile">libkpathsea</filename>, install a couple of essential
+    perl modules supplied in the source, fix up the PATH so that some of these
+    programs can be run, and initialise the new system (the commands
+    <command>fmtutil-sys --all</command> and <command>mtxrun --generate</command>
+    will produce a <emphasis>lot</emphasis> of output):</para>
+
+<screen role="root"><userinput>ldconfig &amp;&amp;
+mkdir -pv /opt/texlive/${TEXYEAR}/tlpkg/TeXLive/ &amp;&amp;
+install -v -m444 ../texk/tests/TeXLive/* /opt/texlive/${TEXYEAR}/tlpkg/TeXLive/ &amp;&amp;
+mktexlsr &amp;&amp;
+fmtutil-sys --all &amp;&amp;
+mtxrun --generate</userinput></screen>
 
     <para>You can now proceed to <xref linkend="asymptote"/>,
     <xref linkend="biber"/> and / or <xref linkend="xindy"/> if you
-    wish to complete your texlive installation.</para>
+    wish to install them.</para>
 
   </sect2>
@@ -212,11 +256,4 @@
       href="../../xincludes/tex-system.xml"/>
 
-<!--    <para>
-      <parameter>\-\-with-system-xpdf</parameter>: Uniquely, this parameter has
-      a non-standard meaning, it tells <command>configure</command> to use the
-      system-installed <application>poppler</application> headers and library.
-      Again, omit this if you have not installed
-      <application>poppler</application>.
-    </para> -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/tex-xpdf.xml"/>
@@ -232,9 +269,33 @@
       separate binaries and for these it will report "file already exists".
     </para>
-    <para>
-      <parameter>tar -xf texlive-&texlive-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</parameter>:
+
+    <para>
+      <parameter>tar -xf texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</parameter>:
       the tarball contains the files for the texmf-dist directory, and because
       of its size we do not want to waste time and space untarring it and then
       copying the files.
+    </para>
+
+    <para>
+      <parameter>install -v -m444 ../texk/tests/TeXLive/*
+      /opt/texlive/${TEXYEAR}/tlpkg/TeXLive/</parameter>: This puts the perl
+      modules <filename>TLConfig.pm</filename> and <filename>TLUtils.pm</filename>
+      into the directory where the binary installer puts them - it is at the
+      start of the perl @INC@ PATH within texlive when installed using the above
+      configure switches. Without these modules, texlive is unusable.
+    </para>
+
+    <para>
+      <parameter>mktexlsr</parameter>: Create an <filename>ls-R</filename> file
+      which lists what was installed - this is used by kpathsea to find files.
+    </para>
+
+    <para>
+      <parameter>fmtutil-sys --all</parameter>: This initialises the TeX formats,
+      Metafont bases and Metapost mems.
+    </para>
+
+    <para>
+      <parameter>mtxrun --generate</parameter>: This initialise the ConTeXt system.
     </para>
 
@@ -251,7 +312,8 @@
       <seglistitem>
         <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.so, libptexenc.so</seg>
-        <seg>/opt/texlive/&texlive-year;/bin, /opt/texlive/&texlive-year;/texmf-dist,
-        /usr/include/kpathsea, /usr/include/ptexenc</seg>
+        <seg>libkpathsea.so, libptexenc.so, libsynctex.so, libtexlua52.so,
+        libtexluajit.so</seg>
+        <seg>/opt/texlive/&texlive-year;/bin, /opt/texlive/&texlive-year;/include,
+        /opt/texlive/&texlive-year;/lib, /opt/texlive/&texlive-year;/texmf-dist</seg>
       </seglistitem>
     </segmentedlist>
@@ -297,4 +359,40 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry id="libsynctex">
+        <term><filename class="libraryfile">libsynctex.so</filename></term>
+        <listitem>
+          <para>
+            is the SyncTeX (Synchronize TeXnology) parser library.
+          </para>
+          <indexterm zone="texlive libsynctex">
+            <primary sortas="c-libsynctex">libsynctex.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtexlua52">
+        <term><filename class="libraryfile">libtexlua52.so</filename></term>
+        <listitem>
+          <para>
+            provides Lua 5.2, modified for use with LuaTeX.
+          </para>
+          <indexterm zone="texlive libtexlua52">
+            <primary sortas="c-libtexlua52">libtexlua52.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtexluajit">
+        <term><filename class="libraryfile">libtexluajit.so</filename></term>
+        <listitem>
+          <para>
+            provides LuaJIT, modified for use with LuaJITTeX.
+          </para>
+          <indexterm zone="texlive libtexluajit">
+            <primary sortas="c-libtexluajit">libtexluajit.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ pst/typesetting/tl-installer.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -8,9 +8,9 @@
 
   <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "f5b1e909d5c2380cefd2cda83d288c00">
-  <!ENTITY tl-installer-date             "20140628"> <!-- in the directory name -->
+  <!ENTITY tl-installer-md5sum          "84bc572abd61dfcc1b377e71c1b9aca8">
+  <!ENTITY tl-installer-date             "20150613"> <!-- in the directory name -->
   <!ENTITY tl-installer-size            "3.2 MB">
 
-  <!ENTITY tl-installer-buildsize        "3.8 GB">
+  <!ENTITY tl-installer-buildsize        "4.2 GB">
   <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
 ]>
@@ -47,5 +47,5 @@
     <filename class="directory">&texlive-year;/</filename> directory.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,5 +58,5 @@
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &tl-installer-md5sum; (at &tl-installer-date;)</para>
+        <para>Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)</para>
       </listitem>
       <listitem>
@@ -113,5 +113,5 @@
       dependencies may change when the installer is updated.
     </para>
-    <!-- text for runtime deps, shared with texlive and pass 1 -->
+    <!-- text for runtime deps, shared with texlive -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
      href="../../xincludes/texruntime.xml"/>
@@ -163,5 +163,5 @@
     <para>This command is interactive and allows selection or modification of
     platform, packages, directories, and other options.  The full installation
-    scheme will require about 3.8 gigabytes of disk space.  The time to complete
+    scheme will require about 4.2 gigabytes of disk space.  The time to complete
     the download will depend on your internet connection speed and the
     number of packages selected.</para>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ pst/typesetting/typesetting.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -25,6 +25,6 @@
   source, or because they only want a part of the package, or perhaps because
   they wish to get updates as soon as those are available (the source is only
-  updated annually, but the binaries and associated TeX files are updated for
-  approximately 10 months). These people should begin at <xref
+  updated annually, but the binaries and associated tex and sty files are updated
+  for approximately 10 months). These people should begin at <xref
   linkend="tex-path"/> and then follow the <xref linkend="tl-installer"/>
   instructions,. After installing, they can run
@@ -46,11 +46,10 @@
   <para>Because the texmf files (including documentation, fonts, scripts and
   supporting files) are all in one tarball, it is not practical to limit what
-  gets extracted in a sensible way (e.g. to exclude one or other of the typesetting
-  engines) when building from source in this manner.</para>
+  gets extracted in a sensible way  (you could exclude one or other of the
+  typesetting engines, not its many supporting files) when building from source
+  in this manner.</para>
 
   <para>In either case, BLFS installs into
-  <filename class="directory">/opt/texlive/&texlive-year;</filename> with the sole
-  exception of two libraries from the source install which are installed into
-  <filename class="directory">/usr/lib</filename> for convenience.</para>
+  <filename class="directory">/opt/texlive/&texlive-year;</filename>.</para>
 
   <para>Also, please note that texlive is released annually, and updating from the
Index: xincludes/tex-lib.xml
===================================================================
--- xincludes/tex-lib.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ xincludes/tex-lib.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -8,5 +8,5 @@
 <para>
   <parameter>--includedir=, --libdir= ...</parameter> : these switches ensure
-  that the libraries will be found at runtime, and that programs can be
-  compiled against them.
+  that the libraries and include files will be within the directories for this
+  year's texlive.
 </para>
Index: xincludes/tex-shared.xml
===================================================================
--- xincludes/tex-shared.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ xincludes/tex-shared.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -8,5 +8,8 @@
 <para>
   <parameter>--enable-shared</parameter>: Use shared versions of
-  <filename class="libraryfile">libkpathsea</filename> and
-  <filename class="libraryfile">libptexenc</filename>.
+  <filename class="libraryfile">libkpathsea</filename>,
+  <filename class="libraryfile">libptexenc</filename>,
+  <filename class="libraryfile">libsynctex</filename>,
+  <filename class="libraryfile">libtexlua52</filename> and
+  <filename class="libraryfile">libtexluajit</filename>.
 </para>
Index: xincludes/texprogs.xml
===================================================================
--- xincludes/texprogs.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ xincludes/texprogs.xml	(revision f5948579d1ce6723ccc4a05b744813003d8846d9)
@@ -11,9 +11,8 @@
           <para>The programs included in <application>TeX</application>
           are too numerous to individually list. Please refer to the individual
-          program HTML and PDF pages in the installation directory's
-          <filename>&texlive-year;/doc.html</filename> file,
+          program HTML and PDF pages in the
           <!-- the html and pdf here refer to file extensions, not abbreviations,
            so they are in lowercase -->
-          or the various html, man, or pdf files within the subdirectories of
+          various html, man, or pdf files within the subdirectories of
           <filename class="directory">&texlive-year;/texmf-dist/</filename>.
           Using <command>texdoc pdflatex</command> ( replace
