Index: kde/core/kde-libs.xml
===================================================================
--- kde/core/kde-libs.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/kde-libs.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,9 @@
+<sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
+<title>kdelibs-&kde-version;</title>
+
+&kde-libs-intro;
+&kde-libs-inst;
+&kde-libs-exp;
+&kde-libs-desc;
+ 
+</sect1>
Index: kde/core/libs/kde-libs-desc.xml
===================================================================
--- kde/core/libs/kde-libs-desc.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs-desc.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,5 @@
+<sect2><title>Contents</title>
+<para>kdelibs provides numerous libraries needed by
+<acronym>KDE</acronym> programs.</para>
+
+</sect2>
Index: kde/core/libs/kde-libs-exp.xml
===================================================================
--- kde/core/libs/kde-libs-exp.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs-exp.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,20 @@
+<sect2><title>Command explanations</title>
+<para><command>--prefix=&kde-dir;</command> : This option tells
+the process to install the package in <filename
+class="directory">&kde-dir;</filename>.</para>
+
+<para><command>--disable-debug</command> : This option causes the
+system to be compiled without debugging code.</para>
+
+<para><command>--disable-dependency-tracking</command> : This option
+speeds up one time builds.</para>
+
+<para><command>--with-alsa</command> : This option tells the build
+process to
+search for and use Alsa for sound support.</para>
+
+<para><command>--enable-fast-malloc=full</command> : This option tells
+<acronym>KDE</acronym> programs to use an internal memory allocation
+scheme
+optimized for <acronym>KDE</acronym>.</para>
+</sect2>
Index: kde/core/libs/kde-libs-inst.xml
===================================================================
--- kde/core/libs/kde-libs-inst.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs-inst.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Installation of <application>kdelibs</application></title>
+
+<!--
+<warning><para>The <acronym>KDE</acronym> instructions are being
+revised. The instructions should
+work as described in the following sections, but not all KDE packages
+have been validated.</para></warning>
+-->
+
+<para>Install <application>kdelibs</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full
+&amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/core/libs/kde-libs-intro.xml
===================================================================
--- kde/core/libs/kde-libs-intro.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs-intro.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Introduction to <application>kdelibs</application></title>
+
+<para>This package includes libraries that are central to the
+development and execution of a <acronym>KDE</acronym> program, as well 
+as internationalization files for these libraries, misc 
+<acronym>HTML</acronym> documentation, theme modules and regression 
+tests.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kde-libs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kde-libs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kde-libs-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kde-libs-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kde-libs-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdelibs</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kde-core-arts"/></para></sect4>
+<sect4><title>Recommended</title>
+<para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
+linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
+linkend="libfam"/> and <xref linkend="libart_lgpl"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="cups"/>, <xref linkend="sane"/> and <xref
+linkend="openldap"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/core/libs/kde-libs.ent
===================================================================
--- kde/core/libs/kde-libs.ent	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs.ent	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -0,0 +1,10 @@
+<!ENTITY kde-libs SYSTEM "../kde-libs.xml">
+<!ENTITY kde-libs-intro SYSTEM "kde-libs-intro.xml">
+<!ENTITY kde-libs-inst SYSTEM "kde-libs-inst.xml">
+<!ENTITY kde-libs-exp SYSTEM "kde-libs-exp.xml">
+<!ENTITY kde-libs-desc SYSTEM "kde-libs-desc.xml">
+<!ENTITY kde-libs-download-http "">
+<!ENTITY kde-libs-download-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kde-libs-size "10 MB">
+<!ENTITY kde-libs-buildsize "193 MB">
+<!ENTITY kde-libs-time "35.34 SBU">
Index: e/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 9d3b84ad74e3b6c317067bc525e20af08ab77c31)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
-<title>kdelibs-&kde-version;</title>
- 
-<sect2>
-<title>Introduction to <application>kdelibs</application></title>
-
-<para>This package includes libraries that are central to the
-development and execution of a <acronym>KDE</acronym> program, as well 
-as internationalization files for these libraries, misc 
-<acronym>HTML</acronym> documentation, theme modules and regression 
-tests.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-libs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-libs-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-libs-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-libs-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-libs-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdelibs</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-core-arts"/></para></sect4>
-<sect4><title>Recommended</title>
-<para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
-linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
-linkend="libfam"/> and <xref linkend="libart_lgpl"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="cups"/>, <xref linkend="sane"/> and <xref linkend="openldap"/>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdelibs</application></title>
-
-<!-- 
-<warning><para>The <acronym>KDE</acronym> instructions are being revised. The instructions should
-work as described in the following sections, but not all KDE packages
-have been validated.</para></warning>
--->
-
-<para>Install <application>kdelibs</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2><title>Command explanations</title>
-<para><command>--prefix=&kde-dir;</command> : This option tells
-the process to install the package in <filename
-class="directory">&kde-dir;</filename>.</para>
-
-<para><command>--disable-debug</command> : This option causes the
-system to be compiled without debugging code.</para>
-
-<para><command>--disable-dependency-tracking</command> : This option
-speeds up one time builds.</para>
-
-<para><command>--with-alsa</command> : This option tells the build process to
-search for and use Alsa for sound support.</para>
-
-<para><command>--enable-fast-malloc=full</command> : This option tells
-<acronym>KDE</acronym> programs to use an internal memory allocation scheme 
-optimized for <acronym>KDE</acronym>.</para>
-</sect2>
-
-<sect2><title>Contents</title>
-<para>kdelibs provides numerous libraries needed by
-<acronym>KDE</acronym> programs.</para>
-
-</sect2>
-</sect1>
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 9d3b84ad74e3b6c317067bc525e20af08ab77c31)
+++ kde/kde.ent	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
@@ -9,7 +9,8 @@
 <!ENTITY kde-core SYSTEM "core/core.xml">
 <!ENTITY kde-core-config SYSTEM "core/config.xml">
-
 <!ENTITY % kde-core-arts SYSTEM "core/arts/arts.ent">
+<!ENTITY % kde-libs SYSTEM "core/libs/kde-libs.ent">
 %kde-core-arts;
+%kde-libs;
 
 <!-- KDE Additional -->
@@ -26,11 +27,4 @@
 <!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
 <!ENTITY kdm SYSTEM "inst/kdm.xml"> -->
-
-<!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
-<!ENTITY kde-libs-buildsize "193 MB">
-<!ENTITY kde-libs-download-http "">
-<!ENTITY kde-libs-download-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size "10 MB">
-<!ENTITY kde-libs-time "35.34 SBU">
 
 <!ENTITY kde-base SYSTEM "inst/kde-base.xml">
