Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 0ea627b56d310a7422d9be049852bfc9fd6288c0)
+++ general/graphlib/libpng.xml	(revision 5eda3193f094cea07acf0658d8109b33fd31dc4a)
@@ -7,9 +7,9 @@
   <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.bz2">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "3270bf2990c3174ae939388398de751e">
-  <!ENTITY libpng-size          "824 KB">
-  <!ENTITY libpng-buildsize     "11.2 MB">
-  <!ENTITY libpng-time          "0.3 SBU">
-  <!ENTITY apng-patch           "&sourceforge-repo2;/projects/libpng-apng/files/libpng-devel/1.5.5/libpng-1.5.5-apng.patch.gz">
+  <!ENTITY libpng-md5sum        "590ecbecd6286810184fd3e66f151de3">
+  <!ENTITY libpng-size          "839 KB">
+  <!ENTITY libpng-buildsize     "12 MB">
+  <!ENTITY libpng-time          "0.1 SBU">
+  <!ENTITY apng-patch           "&sourceforge-repo2;/projects/libpng-apng/files/libpng15/1.5.7/libpng-1.5.7-apng.patch.gz">
 ]>
 
@@ -71,5 +71,4 @@
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libpng"/></para>
-
   </sect2>
 
@@ -77,17 +76,19 @@
     <title>Installation of libpng</title>
 
-    <para>If you want to patch libpng to support apng files, apply the patch:</para>
+    <para>If you want to patch libpng to support apng files, apply the
+    patch:</para>
 
-<screen><userinput>gunzip --stdout ../libpng-1.5.5-apng.patch.gz | patch -Np1</userinput></screen>
+<screen><userinput>gunzip --stdout ../libpng-&libpng-version;-apng.patch.gz | patch -Np1</userinput></screen>
 
     <para>Install <application>libpng</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -96,4 +97,11 @@
 install -v -m644    README libpng-manual.txt \
                     /usr/share/doc/libpng-&libpng-version;</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>--disable-static</option>: This option prevents it compiling
+    the static archive versions of the libraries.</para>
   </sect2>
 
@@ -107,7 +115,7 @@
 
       <seglistitem>
-        <seg>libpng-config and libpng12-config</seg>
-        <seg>libpng.{so,a} and libpng12.{so,a}</seg>
-        <seg>/usr/include/libpng12 and
+        <seg>libpng-config and libpng15-config</seg>
+        <seg>libpng.so and libpng15.so</seg>
+        <seg>/usr/include/libpng15 and
         /usr/share/doc/libpng-&libpng-version;</seg>
       </seglistitem>
@@ -122,5 +130,5 @@
         <term><command>libpng-config</command></term>
         <listitem>
-          <para>is a symlink to <command>libpng12-config</command>.</para>
+          <para>is a symlink to <command>libpng15-config</command>.</para>
           <indexterm zone="libpng libpng-config">
             <primary sortas="g-libpng-config">libpng-config</primary>
@@ -129,32 +137,29 @@
       </varlistentry>
 
-      <varlistentry id="libpng12-config">
-        <term><command>libpng12-config</command></term>
+      <varlistentry id="libpng15-config">
+        <term><command>libpng15-config</command></term>
         <listitem>
           <para>provides configuration information for
           <application>libpng</application>.</para>
-          <indexterm zone="libpng libpng12-config">
-            <primary sortas="b-libpng12-config">libpng12-config</primary>
+          <indexterm zone="libpng libpng15-config">
+            <primary sortas="b-libpng15-config">libpng15-config</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libpng12">
-        <term><filename class='libraryfile'>libpng.{so,a} and
-        libpng12.{so,a}</filename></term>
+      <varlistentry id="libpng15">
+        <term><filename class='libraryfile'>libpng.so and
+        libpng15.so</filename></term>
         <listitem>
           <para>are a collection of routines used to create and manipulate PNG
-          format graphics files. The PNG format was designed as a replacement for
-          GIF and, to a lesser extent, TIFF, with many improvements and extensions
-          and lack of patent problems.</para>
-          <indexterm zone="libpng libpng12">
-            <primary sortas="c-libpng12">libpng12.{so,a}</primary>
+          format graphics files. The PNG format was designed as a replacement
+          for GIF and, to a lesser extent, TIFF, with many improvements and
+          extensions and lack of patent problems.</para>
+          <indexterm zone="libpng libpng15">
+            <primary sortas="c-libpng15">libpng15.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
