Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
+++ kde/add/kdeadmin.xml	(revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -4,10 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY kdeadmin-download-http "&kde-download-http;/kdeadmin-&kde-version;.tar.bz2">
-  <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;/kdeadmin-&kde-version;.tar.bz2">
-  <!ENTITY kdeadmin-md5sum        "eb23c52c945f31a48f2c9df4330a1262">
-  <!ENTITY kdeadmin-size          "2.0 MB">
-  <!ENTITY kdeadmin-buildsize     "26 MB">
-  <!ENTITY kdeadmin-time          "1.6 SBU">
+  <!ENTITY kdeadmin-download-http "&trinity-repo-http;/kdeadmin-&trinity-version;.tar.bz2">
+  <!ENTITY kdeadmin-download-ftp  "&trinity-repo-ftp;/kdeadmin-&trinity-version;.tar.bz2">
+  <!ENTITY kdeadmin-md5sum        "b8bbabf353070a3e730464e0ce2960e2">
+  <!ENTITY kdeadmin-size          "1.9 MB">
+  <!ENTITY kdeadmin-buildsize     "132 MB">
+  <!ENTITY kdeadmin-time          "1.4 SBU">
 ]>
 
@@ -20,5 +20,5 @@
   </sect1info>
 
-  <title>Kdeadmin-&kde-version;</title>
+  <title>Kdeadmin-&trinity-version;</title>
 
   <indexterm zone="kdeadmin">
@@ -59,13 +59,19 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="kdebase"/></para>
+    <para role="required">
+      <xref linkend="kdebase"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/> and
-    <xref linkend="libxml2"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/> and
-    <ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
+    <para role="optional">
+      <xref linkend="linux-pam"/> and
+      <ulink url="http://lilo.go.dyndns.org/">LILO</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,6 +94,16 @@
     <para>Install <application>kdeadmin</application> with:</para>
 
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
+<screen><userinput> 
+cp -v /usr/share/aclocal/libtool.m4       admin/libtool.m4.in &amp;&amp;
+cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh     &amp;&amp;
+sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@" admin/acinclude.m4.in &amp;&amp;
+make -f admin/Makefile.common                                 &amp;&amp;
+
+./configure --prefix=$TRINITY_PREFIX \
+            --enable-closure         \
+            --sysconfdir=/etc        \
+            --localstatedir=/var     \
+            --with-extra-libs=$TRINITY_PREFIX/lib &amp;&amp;
+
 make</userinput></screen>
 
@@ -97,4 +113,22 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>cp -v /usr/share/... admin/...</command>: 
+    Ensure the .m4 files are consistent with the current autotools version.</para>
+
+    <para><command>sed ... admin/acinclude.m4.in</command>: 
+    Update the paths to the Trinity libraries.</para>
+
+    <para><command>make -f admin/Makefile.common</command>: Create the configure
+    script.</para>
+
+    <para><parameter>--with-extra-libs=$TRINITY_PREFIX/lib</parameter>: This
+    option ensure the Trinity libraries are found in the
+    <filename>Makefile</filename>s.</para>
 
   </sect2>
@@ -109,7 +143,7 @@
 
       <seglistitem>
-        <seg>kcron, kdat, kpackage, ksysv, and kuser</seg>
-        <seg>None</seg>
-        <seg>None</seg>
+        <seg>kcron, kdat, kpackage, ksysv, kuser, and secpolicy</seg>
+        <seg>kcm_knetworkconfmodule.so, kfile_deb.so, and kfile_rpm.so</seg>
+        <seg>$TRINITY_PREFIX/lib/trinity</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
+++ kde/core/kdebase.xml	(revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY kdebase-download-http "&trinity-repo-http;/kdebase-&kde-version;.tar.gz">
-  <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&kde-version;.tar.gz">
+  <!ENTITY kdebase-download-http "&trinity-repo-http;/kdebase-&trinity-version;.tar.gz">
+  <!ENTITY kdebase-download-ftp  "&trinity-repo-ftp;/kdebase-&trinity-version;.tar.gz">
   <!ENTITY kdebase-md5sum        "d1f7e1f94eeb46b981fe1ba144179840">
   <!ENTITY kdebase-size          "28.3 MB">
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kdebase" xreflabel="kdebase-&kde-version;">
+<sect1 id="kdebase" xreflabel="kdebase-&trinity-version;">
   <?dbhtml filename="kdebase.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kdebase-&kde-version;</title>
+  <title>Kdebase-&trinity-version;</title>
 
   <indexterm zone="kdebase">
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
+++ kde/core/kdelibs.xml	(revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
+<sect1 id="kdelibs" xreflabel="kdelibs-&trinity-version;">
   <?dbhtml filename="kdelibs.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kdelibs-&kde-version;</title>
+  <title>Kdelibs-&trinity-version;</title>
 
   <indexterm zone="kdelibs">
@@ -56,13 +56,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdelibs-&kde-version;-charset-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
 
Index: kde/core/tqtinterface.xml
===================================================================
--- kde/core/tqtinterface.xml	(revision a8d5ef7556ec0740e74d12016c8b9d9ca0fc78d9)
+++ kde/core/tqtinterface.xml	(revision 3fea4ca1ba2bfd630fe80c6c5f8cb199f9760279)
@@ -85,5 +85,5 @@
 cd       $BUILD  &amp;&amp;
 
-cmake $TGT                               \
+cmake $TQT                               \
   -DCMAKE_INSTALL_PREFIX=$TRINITY_PREFIX \
   -DCMAKE_VERBOSE_MAKEFILE=ON            \
