Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ general/graphlib/libpng.xml	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -8,10 +8,10 @@
            "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "ee752da8aa75076500e4cf31318e636e">
+  <!ENTITY libpng-md5sum        "9822c25466f060142359f80ed142c9e5">
   <!ENTITY libpng-size          "884 KB">
   <!ENTITY libpng-buildsize     "12 MB (additional 1 MB for the tests)">
   <!ENTITY libpng-time          "0.1 SBU (additional 0.3 SBU for the tests)">
 
-  <!ENTITY apng-version "1.6.12">
+  <!ENTITY apng-version "1.6.13">
 
   <!ENTITY apng-patch
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ general/prog/openjdk.xml	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -390,4 +390,21 @@
 chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
 
+    <para>If desired, you may install a .desktop file corresponding to an entry in a desktop menu for <command>policytool</command>, as <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
+<literal>[Desktop Entry]
+Name=OpenJDK Java 7 Policy Tool
+Name[pt_BR]=OpenJDK Java 7 - Ferramenta de Pol&#237;tica
+Comment=OpenJDK Java 7 Policy Tool
+Comment[pt_BR]=OpenJDK Java 7 - Ferramenta de Pol&#237;tica
+Exec=/opt/jdk/bin/policytool
+Terminal=false
+Type=Application
+Icon=javaws
+Categories=Settings;</literal>
+EOF
+
+install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png &amp;&amp;</userinput></screen>
+
   </sect2>
 
@@ -457,5 +474,5 @@
       user:</para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
 <literal># Begin /etc/profile.d/openjdk.sh
 
@@ -491,11 +508,22 @@
     user:</para>
 
-<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
-<literal>MANDATORY_MANPATH     /opt/jdk/man
+<screen role="root"><userinput>cat >> /etc/profile.d/extrapaths.sh &lt;&lt; "EOF" &amp;&amp;
+# Begin Java addition
+<literal>pathappend /opt/jdk/man       MANPATH
+# End Java addition</literal>
+EOF
+
+
+cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin Java addition
+MANDATORY_MANPATH     /opt/jdk/man
 MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
-MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk</literal>
+MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
+# End Java addition</literal>
 EOF
 
 mandb -c /opt/jdk/man</userinput></screen>
+
+    <para>To test the man pages are correctly installed, issue <command>source /etc/profile</command> and <command>man java</command> to display the respective man page.</para>
 
     </sect3>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ introduction/welcome/changelog.xml	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -44,7 +44,29 @@
 
 -->
+
     <listitem>
       <para>August 24th, 2014</para>
       <itemizedlist>
+       <listitem>
+          <para>[fernando] - LibreOffice-4.3.0: reorder some dependencies; 
+          add comment about the two SBUs and buildsizes, thanks to Christopher
+          G, from systemd branch, for noticing.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - OpenJDK-1.7.0.65/IcedTea-2.5.1: fix man pages and
+          add a desktop file.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to icedtea-web-1.5.1, reorder some
+          dependencies and add a desktop file. Replace Xulrunner-31.0 dependency
+          by NPAPI-SDK-0.27.2, thanks to Armin K, from systemd branch for
+          remembering (I had asked about this in one list some time ago, but
+          forgot to check). Fixes
+          <ulink url="&blfs-ticket-root;5389">#5389</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libpng-1.6.13. Fixes
+          <ulink url="&blfs-ticket-root;5418">#5418</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Make TeX Live use system gc for asymptote.</para>
@@ -52,5 +74,4 @@
       </itemizedlist>
     </listitem>
-
 
     <listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ packages.ent	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -164,5 +164,5 @@
 <!ENTITY libjpeg-turbo-version        "1.3.1">
 <!ENTITY libmng-version               "2.0.2">
-<!ENTITY libpng-version               "1.6.12">
+<!ENTITY libpng-version               "1.6.13">
 <!ENTITY librsvg-version              "2.40.3">   <!-- Normally even minors
                                                        Required version in order to use
@@ -565,5 +565,5 @@
 <!ENTITY gnash-version                "0.8.10">
 <!ENTITY gimp-version                 "2.8.10">
-<!ENTITY icedtea-web-version          "1.5">
+<!ENTITY icedtea-web-version          "1.5.1">
 <!ENTITY inkscape-version             "0.48.5">
 <!ENTITY pan-version                  "0.133">
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ xsoft/office/libreoffice.xml	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -23,6 +23,15 @@
   <!ENTITY libreoffice-translations-size          "121 MB">
 
+  <!-- This package has some peculiarities, some discussed in the text.
+  Two values for SBU and buildsize are given due to the large difference
+  measured by editors, depending on architecture and sometimes installed
+  dependencies (with-system... -->
+
   <!ENTITY libreoffice-buildsize          "8.23 GB (497 MB installed) - 9.6 GB (528 MB installed), with translations">
   <!ENTITY libreoffice-time               "144 SBU - 165 SBU, with translations">
+  <!-- This package has some peculiarities, some discussed in the text.
+  Two values for SBU and buildsize are given due to the large difference
+  measured by editors, depending on architecture and sometimes installed
+  dependencies (with-system... -->
 ]>
 
@@ -158,7 +167,4 @@
 
     <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="gtk2"/>,
     <!--<xref linkend="boost"/>,-->
       <xref linkend="clucene"/>,
@@ -166,7 +172,10 @@
       <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="glu"/>,
       <xref linkend="graphite2"/>,
       <xref linkend="gst-plugins-base"/> or
       <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/>,
       <xref linkend="harfbuzz"/>,
       <xref linkend="icu"/>,
Index: xsoft/other/icedtea-web.xml
===================================================================
--- xsoft/other/icedtea-web.xml	(revision c7c1722b069965ef12950cf559953784f3bc6a05)
+++ xsoft/other/icedtea-web.xml	(revision 76df61ce8390f7c6553dddcf0ffce07a34896876)
@@ -7,8 +7,8 @@
   <!ENTITY icedtea-web-download-http "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
   <!ENTITY icedtea-web-download-ftp  " ">
-  <!ENTITY icedtea-web-md5sum        "a6199869763291879f3a7382b114974c">
-  <!ENTITY icedtea-web-size          "1.5 MB">
+  <!ENTITY icedtea-web-md5sum        "ee53fdd19456a59aa9d3a407d35a358c">
+  <!ENTITY icedtea-web-size          "1.6 MB">
   <!ENTITY icedtea-web-buildsize     "30 MB">
-  <!ENTITY icedtea-web-time          "0.3 SBU">
+  <!ENTITY icedtea-web-time          "0.2 SBU">
 ]>
 
@@ -62,6 +62,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="openjdk"/> and
-      <xref linkend="xulrunner"/>
+      <xref linkend="npapi-sdk"/>, and
+      <xref linkend="openjdk"/> or
+      <xref linkend="java"/> (remember to configure as described in the
+      <xref linkend="openjdk"/> page),
     </para>
 
@@ -72,7 +74,7 @@
       <xref linkend="firefox"/>,
       <xref linkend="midori"/>,
-      <ulink url="http://www.chromium.org/getting-involved/download-chromium">Chromium</ulink>,
-      <ulink url="http://www.opera.com">Opera</ulink>, and
-      <xref linkend="seamonkey"/>
+      <xref linkend="seamonkey"/>,
+      <ulink url="http://www.chromium.org/getting-involved/download-chromium">Chromium</ulink>, and
+      <ulink url="http://www.opera.com">Opera</ulink>
     </para>
 
@@ -81,5 +83,4 @@
       <xref linkend="libxslt"/>,
       <xref linkend="mercurial"/>,
-      <xref linkend="npapi-sdk"/>,
       <ulink url="http://emma.sourceforge.net/">EMMA</ulink>, and
       <ulink url="http://www.eclemma.org/jacoco/">JACOCO</ulink>
@@ -110,4 +111,11 @@
 mandb -c /opt/jdk/man</userinput></screen>
 
+    <para>To test the man pages are correctly installed, issue <command>man policyeditor</command> to display the respective man page.</para>
+
+    <para>If desired, you may install a .desktop file corresponding to an entry in a desktop menu for <command>policyeditor</command>, as <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -Dm0644 itweb-settings.desktop /usr/share/applications/itweb-settings.desktop &amp;&amp;
+install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
+
   </sect2>
 
@@ -151,5 +159,5 @@
 
       <seglistitem>
-        <seg>itweb-settings and javaws</seg>
+        <seg>itweb-settings, javaws and policyeditor</seg>
         <seg>IcedTeaPlugin.so, about.jar, netx.jar, plugin.jar</seg>
         <seg>${JAVA_HOME}/jre/share/icedtea-web</seg>
@@ -179,4 +187,15 @@
           <indexterm zone="icedtea-web javaws-itweb">
             <primary sortas="b-javaws">javaws</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="policyeditor-itweb">
+        <term><command>policyeditor</command></term>
+        <listitem>
+          <para>view and modify security policy settings, including
+          certificates, for javaws and the browser plugin.</para>
+          <indexterm zone="icedtea-web policyeditor-itweb">
+            <primary sortas="b-policyeditor">policyeditor</primary>
           </indexterm>
         </listitem>
