Index: pst/typesetting/biber.xml
===================================================================
--- pst/typesetting/biber.xml	(revision 02d6a4ccf246b277b474e8b35e4d634a98ae3025)
+++ pst/typesetting/biber.xml	(revision 7ee3d7220c815c51ea2a2884da7fe0743a6eb981)
@@ -5,15 +5,11 @@
   %general-entities;
 
-  <!-- please keep the alternative http, with one of them commented, so that
-   a tarball can always be downloaded by a user even if anduin is not yet updated -->
-  <!ENTITY biber-download-http   "&sources-anduin-http;/b/biblatex-biber-&biber-version;.tar.xz">
-  <!-- please edit this one to point to wherever you uploaded \-\->
-  <!ENTITY biber-download-http   "http://www.linuxfromscratch.org/~ken/tmp/biblatex-biber-&biber-version;.tar.xz"> -->
-  <!ENTITY biber-download-ftp    "&sources-anduin-ftp;/b/biblatex-biber-&biber-version;.tar.xz">
-  <!ENTITY biber-md5sum          "bf5191099887a652105ee9bf08bcf958">
-  <!ENTITY biber-size            "1.4 MB">
+  <!ENTITY biber-download-http   "http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/&biber-version;/biblatex-biber.tar.gz">
+  <!ENTITY biber-download-ftp    " ">
+  <!ENTITY biber-md5sum          "c46979acce3befdb3431ffadcc81bdf3">
+  <!ENTITY biber-size            "2.0 MB">
   <!-- buildsize includes the installed biblatex -->
-  <!ENTITY biber-buildsize       "40 MB">
-  <!ENTITY biber-time            "less than 0.1 SBU (0.5 SBU to run the tests)">
+  <!ENTITY biber-buildsize       "37 MB">
+  <!ENTITY biber-time            "less than 0.1 SBU (0.6 SBU to run the tests)">
 
   <!ENTITY biblatex-download-http   "http://sourceforge.net/projects/biblatex/files/biblatex-&biblatex-version;/biblatex-&biblatex-version;.tds.tgz">
@@ -42,10 +38,7 @@
 
     <para>Biber is a BibTeX replacement for users of biblatex, written in
-    <application>Perl</application>. Upstream prefers to provide binaries
-    and no longer offers a source tarball, so that has been taken from the
-    git tree : see the file <filename>Fixes-from-git</filename> to see
-    which changes (since 2.1 was tagged) have been included.</para>
-
-    &gcc5_checked;
+    <application>Perl</application>, with full Unicode support.</para>
+
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,13 +64,18 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Required Additional Download</bridgehead>
-
+    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/biblatex-biber-&biber-version;-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
       <para>The corresponding version of <application>biblatex</application> is
-      a separate project - the tds version is pre-packaged for untarring into
-      the <filename class="directory">texmf-dist</filename> directory.</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&biblatex-download-http;"/></para>
+      a separate project - the tds tarball is pre-packaged for untarring into
+      the <filename class="directory">texmf-dist</filename> directory.
+      Download (HTTP): <ulink url="&biblatex-download-http;"/></para>
       </listitem>
       <listitem>
@@ -108,5 +106,8 @@
       <xref linkend="perl-lwp"/>
       <xref linkend="perl-list-allutils"/>
-      <!-- perl-module-build is pulled in by perl-text-bibtex -->
+      <!-- this is pulled in by perl-text-bibtex, but mention it explicitly
+      so that the note on automatically installing missing dependencies makes
+      more sense -->
+      <xref linkend="perl-module-build"/>
       <xref linkend="perl-regexp-common"/>
       <xref linkend="perl-text-bibtex"/>
@@ -135,9 +136,30 @@
     <note>
       <para>
+        Although the tarball name is unversioned, it will untar to a
+        correctly-versioned biblatex-biber-&biber-version; directory.
+      </para>
+
+      <para>
         It is possible to install (all) missing dependencies automatically.
-        Begin by running <command>perl ./Build.PL</command> and then when it
+        From <application>perl-5.22.0</application> onwards,
+        <xref linkend="perl-module-build"/> is no longer part of
+        the core distribution.  To automatically install the remaining perl
+        dependencies you will need to install that first.
+        You can then run <command>perl ./Build.PL</command> and when it
         prompts you, become the root user and run
         <command>./Build installdeps</command>
       </para>
+
+      <para>
+        If you run <command>./Build.PL</command> under versions of
+        <application>perl</application> after 5.20.2 it will tell you that the
+        version of <application>Unicode::Normalize</application> is too
+        <emphasis>new</emphasis>. In fact, the new version works, but is now
+        pure perl and takes longer to run : <emphasis>much</emphasis> longer
+        if you have a large bibliography.  You can find the old version at <ulink
+        url="http://backpan.perl.org/authors/id/S/SA/SADAHIRO/Unicode-Normalize-1.17.tar.gz"/>
+        and use the standard <xref linkend="perl-standard-install"/>
+        to install it if you wish. Further details are in the User Notes.
+      </para>
     </note>
 
@@ -151,10 +173,17 @@
 
     <para>Install <application>Biber</application> by running the following
-    commands:</para>
-
-<screen><userinput>perl ./Build.PL &amp;&amp;
+    commands (patching the read-only files will produce warnings):</para>
+
+<screen><userinput>patch -Np1 -i ../biblate-biber-&biber-version;-upstream_fixes-1.patch &amp;&amp;
+sed -i 's/ 44/ 43/' t/bcfvalidation.t &amp;&amp;
+perl ./Build.PL &amp;&amp;
 ./Build</userinput></screen>
 
-    <para>To test the results, enter: <command>./Build test</command></para>
+    <para>To test the results, enter: <command>./Build test</command> - you will
+    require the en_GB.UTF-8 and sv_SE.UTF-8 locales. Two tests (and two subtests)
+    will fail : for speed the tests use system locales instead of the default
+    Unicode::Collation algorithm, and some minor details of the locales in OSX
+    (where development takes place) differ from those in
+    <application>glibc</application></para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -168,4 +197,17 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>patch -Np1 -i
+      ../biblate-biber-&biber-version;-upstream_fixes-1.patch</parameter>:
+      <application>perl-5.22</application> has become more strict about
+      what needs to be escaped.
+    </para>
+
+    <para>
+      <parameter>sed -i 's/ 44/ 43/' t/bcfvalidation.t</parameter>: Although
+      the git master branch has 44 pairs of files for this test, the shipped
+      tarball only contains 43. The sed prevents it failing.
+    </para>
 
     <para>
