Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 5e51efe2ef0db84a55b2d4c0c88f05bf752b484a)
+++ kde/core/arts.xml	(revision 65ce93ae5876897d9f9e784e2785b525b0df6a3c)
@@ -7,8 +7,8 @@
   <!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
   <!ENTITY arts-download-ftp  "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
-  <!ENTITY arts-md5sum        "62a5e4d522314bab19288e4702480c93">
-  <!ENTITY arts-size          "951 KB">
-  <!ENTITY arts-buildsize     "30 MB">
-  <!ENTITY arts-time          "1.3 SBU">
+  <!ENTITY arts-md5sum        "6da172aab2a4a44929b5fdfc30fa3efc">
+  <!ENTITY arts-size          "956 KB">
+  <!ENTITY arts-buildsize     "28 MB">
+  <!ENTITY arts-time          "1.4 SBU">
 ]>
 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 5e51efe2ef0db84a55b2d4c0c88f05bf752b484a)
+++ kde/core/kdebase.xml	(revision 65ce93ae5876897d9f9e784e2785b525b0df6a3c)
@@ -7,8 +7,8 @@
   <!ENTITY kdebase-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
   <!ENTITY kdebase-download-ftp  "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
-  <!ENTITY kdebase-md5sum        "c8c35389a238aa1b73e68ef5298eadf8">
-  <!ENTITY kdebase-size          "24.0 MB">
-  <!ENTITY kdebase-buildsize     "273 MB (additional 17 MB for API docs)">
-  <!ENTITY kdebase-time          "11 SBU (additional 8.4 SBU for API docs)">
+  <!ENTITY kdebase-md5sum        "88237188271fbf1e6bcd40180a75d953">
+  <!ENTITY kdebase-size          "23.2 MB">
+  <!ENTITY kdebase-buildsize     "185 MB (additional 8.4 MB for API docs)">
+  <!ENTITY kdebase-time          "15.6 SBU (additional 0.1 SBU for API docs)">
 ]>
 
@@ -139,5 +139,5 @@
 <screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
     --disable-debug --disable-dependency-tracking &amp;&amp;
-LD_LIBRARY_PATH="$KDE_PREFIX/lib" make</userinput></screen>
+make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -149,7 +149,11 @@
 
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    This is not true.  If KDE is configured correctly according to the
+    instructions, the libraries are found just fine.  See the 
+    KDE Pre-installation Configuration section.
 
     <para><parameter>LD_LIBRARY_PATH="$KDE_PREFIX/lib" make</parameter>: A bug in
@@ -161,4 +165,5 @@
 
   </sect2>
+-->
   <sect2 role="configuration">
     <title>Configuring Kdebase</title>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 5e51efe2ef0db84a55b2d4c0c88f05bf752b484a)
+++ kde/core/kdelibs.xml	(revision 65ce93ae5876897d9f9e784e2785b525b0df6a3c)
@@ -7,8 +7,8 @@
   <!ENTITY kdelibs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
   <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
-  <!ENTITY kdelibs-md5sum        "55e5f00874933d1a7ba7c95e369a205e">
-  <!ENTITY kdelibs-size          "15.0 MB">
-  <!ENTITY kdelibs-buildsize     "276 MB (additional 431 MB for API docs)">
-  <!ENTITY kdelibs-time          "15 SBU (additional 1.25 SBU for API docs)">
+  <!ENTITY kdelibs-md5sum        "43cd55ed15f63b5738d620ef9f9fd568">
+  <!ENTITY kdelibs-size          "14.9 MB">
+  <!ENTITY kdelibs-buildsize     "254 MB (additional 426 MB for API docs)">
+  <!ENTITY kdelibs-time          "13.1 SBU (additional 3.0 SBU for API docs)">
 ]>
 
@@ -116,16 +116,34 @@
     <para>Install <application>kdelibs</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; \
+<screen><userinput>patch -Np1 -i ../kdelibs-&kde-version;-charset-1.patch &amp;&amp;
+sed -i -e 's|linux/inotify|sys/inotify|'                 \
+       -e '/^static inline int inotify_init/,/^}/d'      \
+       -e '/^static inline int inotify_add_watch/,/^}/d' \
+       -e '/^static inline int inotify_rm_watch/,/^}/d'  \
+       kio/kio/kdirwatch.cpp &amp;&amp;
+./configure --prefix=$KDE_PREFIX  \
             --sysconfdir=/etc/kde \
-            --disable-debug \
+            --disable-debug       \
             --disable-dependency-tracking &amp;&amp;
-LD_LIBRARY_PATH="$QTDIR/lib" make</userinput></screen>
+make</userinput></screen>
 
     <note>
+
       <para>If you wish to create the API documentation and you have
-      <application>Doxygen</application> and <application>Graphviz</application>
-      installed, <command>make apidox</command> must be done before
-      <command>make install</command>. This applies to all packages which
-      can utilize <application>Doxygen</application>.</para>
+      <application>Doxygen</application> and
+      <application>Graphviz</application> installed, it must be done before the
+      <command>make install</command>. This applies to all packages which can
+      utilize <application>Doxygen</application>.</para>
+
+      <para><emphasis>The usual building the API documentation in this package
+      will run forever because of a bug in
+      <application>doxygen</application>.</emphasis>  There is a symbolic link
+      in the <filename class='directory'>kdeprint</filename> directory that is
+      not handled properly.  To fix this, delete the link, generate the 
+      documentation, and recreate the symbolic link:</para>
+
+      <screen><userinput>rm kdeprint/kdeprint &amp;&amp;
+make apidox &amp;&amp;
+ln -s  management kdeprint/kdeprint</userinput></screen>
 
       <para>The <command>make apidox</command> command generates a lot of
@@ -155,4 +173,8 @@
     <title>Command Explanations</title>
 
+    <para><command>sed -i ... kio/kio/kdirwatch.cpp</command>: This command is
+    necessary to prevent a conflict in linux headers.  The equivalent
+    instructions that are deleted are now within glibc.</para> 
+
     <para><parameter>--prefix=&kde-dir;</parameter>: This option tells the process
     to install the package in <filename class="directory">&kde-dir;</filename>.</para>
@@ -163,10 +185,4 @@
     <para><parameter>--disable-dependency-tracking</parameter>: This option
     speeds up one time builds.</para>
-
-<!--
-    <para><parameter>- -enable-fast-malloc=full</parameter>: This option tells
-    <application>KDE</application> programs to use an internal memory
-    allocation scheme optimized for <application>KDE</application>.</para>
--->
 
     <para><parameter>--sysconfdir=/etc/kde</parameter>: This option places
@@ -177,10 +193,4 @@
     class='directory'>$KDE_PREFIX/etc</filename> which may be desirable if
     you have multiple versions of <application>KDE</application> installed.</para>
-
-    <para><parameter>LD_LIBRARY_PATH="$QTDIR/lib" make</parameter>: A bug in the
-    <application>kdelibs</application> build system prevents <application>Qt</application>
-    from being found by the Makefiles if <application>Qt</application> was
-    installed in <filename class='directory'>/opt</filename>. Setting LD_LIBRARY_PATH
-    works around the problem.</para>
 
   </sect2>
