Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 8da658bab859dd258af60552f3a96fba90f5f414)
+++ general/graphlib/poppler.xml	(revision da8baac5c68f2911c764093a96330cec93e919f9)
@@ -5,18 +5,19 @@
   %general-entities;
 
-  <!ENTITY poppler-download-http
-           "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
+  <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "7d788f85bca1c03d71773af0b902e203">
-  <!ENTITY poppler-size               "1.5 MB">
-  <!ENTITY poppler-buildsize          "185 MB (building Qt4 and 5 libraries, add'l 63 MB for tests)">
-  <!ENTITY poppler-time               "1.4 SBU (building Qt4 and 5 libraries, add'l 0.4 SBU for tests)">
+  <!ENTITY poppler-md5sum             "561ef4454bfabe59ef1b8b9cd4aa4c4b">
+  <!ENTITY poppler-size               "1.6 MB (additional 9 MB for the test suite)">
+  <!ENTITY poppler-buildsize          "64 MB (with Qt4 and Qt5 libraries, and tests)">
+  <!ENTITY poppler-time               "1.5 SBU (with Qt4 and Qt5 libraries, and tests)">
+
 
   <!ENTITY poppler-data-version       "0.4.7">
 
-  <!ENTITY poppler-data-download-http
-           "http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
+  <!ENTITY poppler-data-download-http "http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
   <!ENTITY poppler-data-md5sum        "636a8f2b9f6df9e7ced8ec0946961eaf">
   <!ENTITY poppler-data-size          "4.0 MB">
+  <!ENTITY poppler-data-buildsize     "24 MB">
+  <!ENTITY poppler-data-time          "less than 0.1 SBU">
 ]>
 
@@ -97,4 +98,14 @@
         <para>
           Download size: &poppler-data-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &poppler-data-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &poppler-data-time;
         </para>
       </listitem>
@@ -148,6 +159,6 @@
 
     <para>
-      In order to optionally run the test suite, an additional download of about
-      9 MB using <xref linkend="git"/> is necessary.
+      In order to optionally run the test suite, an additional download using
+      <xref linkend="git"/> is necessary.
     </para>
 
@@ -161,11 +172,11 @@
       are installed, and you wish support for only one, before executing the
       <command>configure</command> command given below, use this command to
-      select Qt4: 
-      
-      <screen><userinput>source /usr/bin/setqt4</userinput></screen> 
+      select Qt4:
+
+      <screen><userinput>source /usr/bin/setqt4</userinput></screen>
 
       or this to select Qt5:
 
-      <screen><userinput>source /usr/bin/setqt5</userinput></screen> 
+      <screen><userinput>source /usr/bin/setqt5</userinput></screen>
     </para></note>
 
@@ -175,10 +186,12 @@
     </para>
 
-<screen><userinput>MOCQT4=$QT4DIR/bin/moc            \
-MOCQT5=$QT5DIR/bin/moc            \
-./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --disable-static      \
-            --enable-xpdf-headers \
+<screen><userinput>MOCQT4=$QT4DIR/bin/moc                  \
+MOCQT5=$QT5DIR/bin/moc                  \
+./configure --prefix=/usr               \
+            --sysconfdir=/etc           \
+            --disable-static            \
+            --enable-build-type=release \
+            --enable-cmyk               \
+            --enable-xpdf-headers       \
             --with-testdatadir=$PWD/testfiles &amp;&amp;
 make</userinput></screen>
@@ -235,4 +248,15 @@
     </para>
 
+    <para>
+      <parameter>--enable-build-type=release</parameter>: This switch is used
+      to apply a higher level of compiler optimizations. Other options are:
+      [<option>relwithdebinfo/debug/debugfull/profile</option>]
+    </para>
+
+    <para>
+      <parameter>--enable-cmyk</parameter>:
+      Include support for CMYK rasterization.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -246,5 +270,5 @@
 
     <para>
-      <option>--with-testdatadir=$PWD/testfiles</option>: Tell the test 
+      <option>--with-testdatadir=$PWD/testfiles</option>: Tell the test
       programs where the auxillary files are located.
     </para>
@@ -259,5 +283,5 @@
     <para>
       <command>LC_ALL=en_US.UTF-8 make check</command>: Run the test suite.
-      The environment variable LC_ALL=en_US.UTF-8 is only needed if the 
+      The environment variable LC_ALL=en_US.UTF-8 is only needed if the
       default locale does not include UTF-8.
     </para>
@@ -286,8 +310,6 @@
         </seg>
         <seg>
-          /usr/include/poppler,
-          /usr/share/doc/poppler-&poppler-version;,
-          /usr/share/gtk-doc/html/poppler, and
-          /usr/share/poppler
+          /usr/{include,share/{gtk-doc/html,}}/poppler and
+          /usr/share/doc/poppler-&poppler-version;
         </seg>
       </seglistitem>
