Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ general/prog/mercurial.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "0b0a63bfbc22d399f42f56fc65c5394b">
-  <!ENTITY mercurial-size          "4.1 MB">
-  <!ENTITY mercurial-buildsize     "320 MB (47 MB for program, 2 MB for documentation, 271MB for tests)">
-  <!ENTITY mercurial-time          "0.1 SBU for program and documentation, 10 SBU for tests">
+  <!ENTITY mercurial-md5sum        "3e3010e12759d3783ab7ed93de627da1">
+  <!ENTITY mercurial-size          "4.3 MB">
+  <!ENTITY mercurial-buildsize     "51 MB (with documentation, additional 294 MB for tests)">
+  <!ENTITY mercurial-time          "0.1 SBU (with documentation, additional 3 SBU for tests, with -j8)">
 ]>
 
@@ -143,5 +143,5 @@
     <para>where you must replace &lt;user_name&gt; and &lt;your@mail&gt; (mail
     is optional and can be omitted). With the user identity defined, run
-    <command>hg debuginstall</command> and several lines will be displayed, 
+    <command>hg debuginstall</command> and several lines will be displayed,
     the last one reading "no problems detected". Another quick and simple test
     is just <command>hg</command>, which should output basic commands that can
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ general/prog/perl-modules.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -10,5 +10,5 @@
 
   <!ENTITY Archive-Zip-download-http "http://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-  <!ENTITY Archive-Zip-md5sum "39d3ee62aefd452b8b86094de46a9214">
+  <!ENTITY Archive-Zip-md5sum "35b81833e44d0001f0e1c86c72f2a6c8">
 
   <!ENTITY autovivification-download-http "http://www.cpan.org/authors/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
@@ -310,5 +310,5 @@
       </listitem>
       <listitem>
-<literallayout>&Business-ISSN-download-http; 
+<literallayout>&Business-ISSN-download-http;
 MD5 sum: &Business-ISSN-md5sum;</literallayout>
       </listitem>
@@ -481,5 +481,5 @@
       </listitem>
       <listitem>
-<literallayout>&Encode-JIS2K-download-http; 
+<literallayout>&Encode-JIS2K-download-http;
 MD5 sum: &Encode-JIS2K-md5sum;</literallayout>
       </listitem>
@@ -1298,5 +1298,5 @@
     </para>
 
-    &lfs77_checked; &gcc5_checked; 
+    &lfs77_checked; &gcc5_checked;
 
     <itemizedlist>
Index: general/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ general/prog/scons.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -7,7 +7,7 @@
   <!ENTITY scons-download-http "&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "8b0d1041266f89b18e47f26d943f8aa5">
-  <!ENTITY scons-size          "620 KB">
-  <!ENTITY scons-buildsize     "5.3 MB">
+  <!ENTITY scons-md5sum        "9c6a1c3c716cbe5f16515f163c91d928">
+  <!ENTITY scons-size          "616 KB">
+  <!ENTITY scons-buildsize     "12 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>
@@ -104,5 +104,5 @@
 
   </sect2>
-  
+
   <sect2 role="content">
     <title>Contents</title>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ introduction/welcome/changelog.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -47,4 +47,25 @@
         <para>August 1st, 2015</para>
         <itemizedlist>
+          <listitem>
+            <para>[fernando] - cups-filters-1.0.71 does not build with
+            poppler-3.4. Fixes
+            <ulink url="&blfs-ticket-root;6777">#6777</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to scons-2.3.6. Fixes
+            <ulink url="&blfs-ticket-root;6776">#6776</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to mercurial-3.5. Fixes
+            <ulink url="&blfs-ticket-root;6775">#6775</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to Archive-Zip-1.49. Fixes
+            <ulink url="&blfs-ticket-root;6774">#6774</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to cups-2.0.4. Fixes
+            <ulink url="&blfs-ticket-root;6772">#6772</ulink>.</para>
+          </listitem>
           <listitem>
             <para>[fernando] - Add sddm-0.11.0. First fix to
@@ -70,5 +91,5 @@
           </listitem>
           <listitem>
-            <para>[fernando] - Update to  stunnel-5.22. Fixes
+            <para>[fernando] - Update to stunnel-5.22. Fixes
             <ulink url="&blfs-ticket-root;6771">#6771</ulink>.</para>
           </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ packages.ent	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -265,5 +265,5 @@
 <!ENTITY llvm-version                 "3.6.2">
 <!ENTITY lua-version                  "5.3.1">
-<!ENTITY mercurial-version            "3.4.2">
+<!ENTITY mercurial-version            "3.5">
 <!ENTITY nasm-version                 "2.11.08">
 <!ENTITY npapi-sdk-version            "0.27.2">
@@ -273,5 +273,5 @@
 <!ENTITY ruby-version                 "2.2.2">
 <!ENTITY ruby-patch-version           "0">
-<!ENTITY scons-version                "2.3.5">
+<!ENTITY scons-version                "2.3.6">
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.8.13">
@@ -294,5 +294,5 @@
 <!-- Perl module versions used in the Perl Modules instructions -->
 <!ENTITY autovivification-version     "0.16">
-<!ENTITY Archive-Zip-version          "1.48">
+<!ENTITY Archive-Zip-version          "1.49">
 <!ENTITY Business-ISBN-version        "2.09">
 <!ENTITY Business-ISMN-version        "1.13">
@@ -759,5 +759,5 @@
 <!-- Part XII -->
 <!-- Chapter 50 -->
-<!ENTITY cups-version                 "2.0.3">
+<!ENTITY cups-version                 "2.0.4">
 <!ENTITY cups-filters-version         "1.0.71">
 <!ENTITY gs-version                   "9.16">
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ pst/printing/cups-filters.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -73,5 +73,5 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,9 +79,9 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/cups-filters-&cups-filters-version;-poppler_fix-1.patch"/>
+          <ulink url="&patch-root;/cups-filters-&cups-filters-version;-poppler0340-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
 
@@ -106,5 +106,5 @@
     <para role="optional">
       <xref linkend="avahi"/> and
-      <xref linkend="php"/> (use of this might be broken) 
+      <xref linkend="php"/> (use of this might be broken)
     </para>
 
@@ -128,16 +128,17 @@
       commands:
     </para>
-<!--
-<userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler_fix-1.patch &amp;&amp;
--->
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --sysconfdir=/etc               \
-            --localstatedir=/var            \
-            --without-rcdir                 \
-            --disable-static                \
-            --with-gs-path=/usr/bin/gs      \
-            --with-pdftops-path=/usr/bin/gs \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
+
+<screen><userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler0340-1.patch &amp;&amp;
+
+./configure                             \
+        --prefix=/usr                   \
+        --sysconfdir=/etc               \
+        --localstatedir=/var            \
+        --without-rcdir                 \
+        --disable-static                \
+        --with-gs-path=/usr/bin/gs      \
+        --with-pdftops-path=/usr/bin/gs \
+        --docdir=/usr/share/doc/cups-filters-&cups-filters-version;      &amp;&amp;
+
 make</userinput></screen>
 
@@ -156,9 +157,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!--
-    <para>
-      <command>patch ...</command>: Allow the package to build with 
-      poppler-0.31.0 and later.
-    </para>-->
 
     <para>
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 9fa25aa2c2c537c20f6124356e3dfb866bc8e370)
+++ pst/printing/cups.xml	(revision 7b88d5aadaa6f233e77a0d7ceed8635210bd30f0)
@@ -7,5 +7,5 @@
   <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
   <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "8d98b85edbdab7ab03739c9622f570e8">
+  <!ENTITY cups-md5sum        "f5c847d9a4fac6c4c66fb0526a7afaae">
   <!ENTITY cups-size          "8.4 MB">
   <!ENTITY cups-buildsize     "99 MB (with tests)">
@@ -97,5 +97,5 @@
       <xref linkend="python2"/>, and
       <xref linkend="xdg-utils"/>
-     
+
     </para>
 
@@ -110,5 +110,5 @@
       <ulink url="http://hplipopensource.com/hplip-web/index.html">hplip</ulink> (HP printers)
     </para>
-      
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/cups"/>
@@ -354,6 +354,6 @@
         jobs, and the server configuration can be set up and managed.
         Remote system administration can also be set up.  Configuration
-        can also be done from the command line via the 
-        <command>lpadmin</command>, <command>lpoptions</command>, 
+        can also be done from the command line via the
+        <command>lpadmin</command>, <command>lpoptions</command>,
         and <command>lpstat</command> commands.
       </para>
@@ -364,5 +364,5 @@
         are easier. For detailed instructions on configuration and use of
         <application>Cups</application>, see <ulink
-        url="http://www.cups.org/documentation.php"/>. 
+        url="http://www.cups.org/documentation.php"/>.
       </para>
 
