Index: general.ent
===================================================================
--- general.ent	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
+++ general.ent	(revision 1afe6c26093e30fed003e1863e9276e235bff6e0)
@@ -4,9 +4,9 @@
 -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "May &day;st, &year;">
+<!ENTITY releasedate  "June &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
+++ introduction/welcome/changelog.xml	(revision 1afe6c26093e30fed003e1863e9276e235bff6e0)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>June 7th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Changed the Qt /usr install with symlinks to
+          the bin, include and lib directories in /usr/share/qt.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 31st, 2007</para>
       <itemizedlist>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
+++ x/lib/qt.xml	(revision 1afe6c26093e30fed003e1863e9276e235bff6e0)
@@ -186,7 +186,5 @@
     <para>Continue with:</para>
 
-<screen><userinput>sed -i -e 's:$(QTDIR)/include:&amp;/qt:' \
-       -e 's:$(QTDIR)/lib:&amp;/qt:' \
-    mkspecs/linux*/qmake.conf &amp;&amp;
+<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
 
 bash
@@ -213,5 +211,4 @@
             -tablet &amp;&amp;
 
-find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" &amp;&amp;
 make &amp;&amp;
 exit</userinput></screen>
@@ -224,4 +221,7 @@
 <screen role="root"><userinput>make install &amp;&amp;
 ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
+ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
+ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
+ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
 cp -v -r doc/man /usr/share &amp;&amp;
 cp -v -r examples /usr/share/doc/qt</userinput></screen>
@@ -294,7 +294,8 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e ... mkspecs/linux*/qmake.conf</command>:
-    Directories in <filename>qmake.conf</filename> need to be adjusted
-    to match the BLFS Method 1 installation directories.</para>
+    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
+    In Method 1, <application>Qt</application> is being installed into
+    the standard system directories. The runtime library search path does not
+    need to be set in this case.</para>
 
     <para><command>bash</command>: This command enters a sub-shell to isolate
@@ -348,13 +349,14 @@
     support for multi-threading.</para>
 
-    <para><command>find -type f -name Makefile | xargs sed -i
-    "s@-Wl,-rpath,/usr/lib@@g"</command>: This command removes hardcoded
-    run-time paths. Otherwise, <command>uic</command> always tries to run
-    with <application>Qt</application> libraries in
-    <filename>/usr/lib</filename>.</para>
-
-    <para><command>ln -v -s libqt-mt.so /usr/lib/libqt.so</command>: This
+    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
     command allows <command>configure</command> scripts to find a working
     <application>Qt</application> installation.</para>
+
+    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
+    command and the following two allow the
+    <filename class="directory">/usr</filename> style installation to mimic
+    the <filename class="directory">/opt</filename> style installation by
+    making all binaries, headers and libraries available from a single
+    directory, <filename class="directory">/usr/share/qt</filename>.</para>
 
     <para><command>cp -v -r doc/man examples /usr/share (or
@@ -382,7 +384,7 @@
 
       <para>For Method 1 (This is optional, only set this if an application is
-      unable to find the installed libraries):</para>
-
-<screen><literal>export QTDIR=/usr</literal></screen>
+      unable to find the installed libraries or headers):</para>
+
+<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
 
       <para>or for Method 2:</para>
