Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision b6a2a0ed3244af247c5123128b898ca95aae37a0)
+++ x/lib/qt.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY qt-download-http "http://get.qt.nokia.com/qt/source/qt-x11-free-&qt-version;.tar.gz">
-  <!ENTITY qt-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-x11-free-&qt-version;.tar.gz">
-  <!ENTITY qt-md5sum        "9f05b4125cfe477cc52c9742c3c09009">
-  <!ENTITY qt-size          "16.5 MB">
-  <!ENTITY qt-buildsize     "261 MB">
-  <!ENTITY qt-time          "11 SBU (full), 7.5 SBU (sub-tools)">
+  <!ENTITY qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
+  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
+  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
+  <!ENTITY qt-size          "16.8 MB">
+  <!ENTITY qt-buildsize     "801 MB">
+  <!ENTITY qt-time          "8.6 SBU">
 ]>
 
@@ -35,5 +35,5 @@
     dynamically linked to the <application>Qt</application> library. Two of
     the major users of <application>Qt</application> are
-    <application>KDE</application> and its foolow on project, 
+    <application>KDE</application> and its follow on project, 
     <application>Trinity</application>.</para>
 
@@ -60,7 +60,12 @@
     </itemizedlist>
 
-
-
-
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+          url="&patch-root;/qt3-3.3.8.d-libpng15-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
 
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
@@ -70,6 +75,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="libmng"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libmng"/>
+    </para>
 
     <para>Note: if for whatever reason you do not have the recommended
@@ -82,11 +89,11 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-<!--    <xref linkend="nas"/>, -->
-    <xref linkend="cups"/>,
-    <xref linkend="mysql"/>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="unixodbc"/>,
-    <xref linkend="sqlite"/>, and
-    <ulink url="http://firebird.sourceforge.net/">Firebird</ulink></para>
+      <xref linkend="cups"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="unixodbc"/>,
+      <xref linkend="sqlite"/>, and
+      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -100,19 +107,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/X11R6_symlink.xml"/>
-
-    <!--<para>The <application>Qt</application> source hard codes the location
-    of the <application>X Window System</application> installation to
-    <filename class="directory">/usr/X11R6</filename>.  If you've installed
-    the <application>X Window System</application> in any prefix other than
-    <filename class="directory">/usr/X11R6</filename>, then you should correct
-    the <application>qmake</application> configuration files with the following
-    commands, replacing <replaceable>&lt;PREFIX&gt;</replaceable> with the
-    installation prefix of the
-    <application>X Window System</application>:</para>
-
-<screen><userinput>for file in $(grep -lr "X11R6" *)
-do
-    sed -i "s@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g" $file
-done</userinput></screen> -->
 
     <para>There are several ways to install a complicated package such as
@@ -158,16 +150,4 @@
       This is the method that most commercial distributions use.</para>
 
-<!--
-      <note>
-        <para>The installation incorrectly uses <command>cp</command> to
-        install the files. This causes problems if the
-        <application>Qt</application> libraries are already in use (e.g.,
-        you are logged into your <application>KDE</application> desktop
-        environment). To avoid problems, <command>cp -f</command> is
-        replaced by <command>install</command> in
-        <filename>qmake.conf</filename>.</para>
-      </note>
--->
-
       <note>
         <para>If <application>Qt</application> is being reinstalled, run the
@@ -180,24 +160,26 @@
 
 bash
-export PATH=$PWD/bin:$PATH &amp;&amp;
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
 
-./configure -prefix /usr \
-            -docdir /usr/share/doc/qt \
-            -headerdir /usr/include/qt \
-            -plugindir /usr/lib/qt/plugins \
-            -datadir /usr/share/qt \
+patch -Np1 -i ../qt3-3.3.8.d-libpng15-1.patch    &amp;&amp;
+
+./configure -prefix     /usr                \
+            -docdir     /usr/share/doc/qt   \
+            -headerdir  /usr/include/qt     \
+            -plugindir  /usr/lib/qt/plugins \
+            -datadir    /usr/share/qt       \
+            -sysconfdir /etc/qt             \
             -translationdir /usr/share/qt/translations \
-            -sysconfdir /etc/qt \
-            -qt-gif \
-            -system-zlib \
-            -system-libpng \
-            -system-libjpeg \
-            -system-libmng \
-            -plugin-imgfmt-png \
-            -plugin-imgfmt-jpeg \
-            -plugin-imgfmt-mng \
-            -no-exceptions \
-            -thread \
+            -qt-gif                         \
+            -system-zlib                    \
+            -system-libpng                  \
+            -system-libjpeg                 \
+            -system-libmng                  \
+            -plugin-imgfmt-png              \
+            -plugin-imgfmt-jpeg             \
+            -plugin-imgfmt-mng              \
+            -no-exceptions                  \
+            -thread                         \
             -tablet &amp;&amp;
 
@@ -237,20 +219,22 @@
 
 <screen><userinput>bash
-export QTDIR=$PWD &amp;&amp;
+export QTDIR=$PWD                                &amp;&amp;
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-export PATH=$PWD/bin:$PATH &amp;&amp;
+export PATH=$PWD/bin:$PATH                       &amp;&amp;
+
+patch -Np1 -i ../qt3-3.3.8.d-libpng15-1.patch    &amp;&amp;
 
 ./configure -prefix /opt/qt-&qt-version; \
-            -sysconfdir /etc/qt \
-            -qt-gif \
-            -system-zlib \
-            -system-libpng \
-            -system-libjpeg \
-            -system-libmng \
-            -plugin-imgfmt-png \
-            -plugin-imgfmt-jpeg \
-            -plugin-imgfmt-mng \
-            -no-exceptions \
-            -thread \
+            -sysconfdir /etc/qt   \
+            -qt-gif               \
+            -system-zlib          \
+            -system-libpng        \
+            -system-libjpeg       \
+            -system-libmng        \
+            -plugin-imgfmt-png    \
+            -plugin-imgfmt-jpeg   \
+            -plugin-imgfmt-mng    \
+            -no-exceptions        \
+            -thread               \
             -tablet &amp;&amp;
 
@@ -427,4 +411,9 @@
       <filename class='directory'>/opt/qt/bin</filename>.</para>
 
+      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
+      the extrapaths.sh (or other script) in the /etc/profile.d directory
+      if you set up the startup files as recommended in 
+      <xref linkend='postlfs-config-profile'/>.</para></tip>
+
       <para>As with most libraries, there is no explicit configuration to do.
       After updating <filename>/etc/ld.so.conf</filename> as explained above,
