Index: general/sysutils/hal.xml
===================================================================
--- general/sysutils/hal.xml	(revision bf325a390ae053872d9f77fa9524efecd4f44b19)
+++ general/sysutils/hal.xml	(revision 1e6b5f642716dc4181d6bc2231d65f1082fc380b)
@@ -95,8 +95,5 @@
     <para role="required"><xref linkend="pkgconfig"/>,
     <xref linkend="glib2"/>,
-    <xref linkend="dbus"/>,
-    <!-- FIXME: Uncomment when the dbus bindings get in the book
     <xref linkend="dbus-glib"/>,
-    -->
     <xref linkend="python"/>, and
     <xref linkend="perl-xml-parser"/></para>
@@ -108,9 +105,7 @@
     (with a current <filename>usb.ids</filename> file)</para>
 
-    <!-- FIXME: Uncomment when the dbus bindings get in the book
     <bridgehead renderas="sect4">Optional (to Build
     <command>hal-device-manager</command>)</bridgehead>
     <para role="optional"><xref linkend="dbus-python"/></para>
-    -->
 
     <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision bf325a390ae053872d9f77fa9524efecd4f44b19)
+++ introduction/welcome/changelog.xml	(revision 1e6b5f642716dc4181d6bc2231d65f1082fc380b)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Modified the D-Bus dependency in several packages
+          to account for the new D-Bus core and bindings separation.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added the Python Bindings to the D-Bus Bindings
           page.</para>
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision bf325a390ae053872d9f77fa9524efecd4f44b19)
+++ xsoft/office/evolution.xml	(revision 1e6b5f642716dc4181d6bc2231d65f1082fc380b)
@@ -78,5 +78,5 @@
     <para role="optional"><xref linkend="openldap"/>,
     <xref linkend="hal"/>,
-    <xref linkend="dbus"/>,
+    <xref linkend="dbus-glib"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
Index: xsoft/other/gaim.xml
===================================================================
--- xsoft/other/gaim.xml	(revision bf325a390ae053872d9f77fa9524efecd4f44b19)
+++ xsoft/other/gaim.xml	(revision 1e6b5f642716dc4181d6bc2231d65f1082fc380b)
@@ -65,6 +65,5 @@
     <ulink url="http://ftp.gnupg.org/gcrypt/gnutls/">GnuTLS</ulink> (requires
     <ulink url="http://ftp.gnupg.org/gcrypt/libgpg-error/">libgpg-error</ulink>
-    and <ulink url="http://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink>
-    in that order),
+    then <ulink url="http://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink>),
     <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>,
     <xref linkend="tcl"/>,
@@ -72,5 +71,4 @@
     <xref linkend="startup-notification"/>,
     <xref linkend="audiofile"/>,
-    <xref linkend="dbus"/>,
     <xref linkend="mitkrb"/>,
     <xref linkend="nas"/>,
@@ -104,10 +102,10 @@
 make</userinput></screen>
 
-    <para>If you want to compile <application>Gaim</application> with support
+    <!-- <para>If you want to compile <application>Gaim</application> with support
     for <xref linkend="nas"/>, configure it like this:</para>
 
-<screen><userinput>CPPFLAGS="-I/usr/X11R6/include" ./configure --prefix=/usr \
-    --enable-nas &amp;&amp;
-make</userinput></screen>
+<screen><userinput>CPPFLAGS="-I/usr/X11R6/include" ./configure -prefix=/usr \
+    -enable-nas &amp;&amp;
+make</userinput></screen> -->
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -119,13 +117,13 @@
   </sect2>
 
-  <sect2 role="commands">
+  <!-- <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>CPPFLAGS=...--enable-nas</command>: To avoid a compilation
+    <para><command>CPPFLAGS=...-enable-nas</command>: To avoid a compilation
     error the <filename>configure</filename> script needs to be told to look
     for the <application>NAS</application> header files in /usr/X11R6/include.
     </para>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
Index: xsoft/other/xchat.xml
===================================================================
--- xsoft/other/xchat.xml	(revision bf325a390ae053872d9f77fa9524efecd4f44b19)
+++ xsoft/other/xchat.xml	(revision 1e6b5f642716dc4181d6bc2231d65f1082fc380b)
@@ -32,6 +32,6 @@
     <para><application>XChat</application> is an IRC chat program.  It allows
     you to join multiple IRC channels (chat rooms) at the same time, talk
-    publicly, have private one-on-one conversations, etc.  File transfers are also
-    possible.</para>
+    publicly, have private one-on-one conversations, etc.  File transfers are
+    also possible.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,20 +60,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-       <xref linkend="glib2"/>
-    </para>
+    <para role="required"><xref linkend="glib2"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref linkend="gtk2"/>
-    </para>
+    <para role="recommended"><xref linkend="gtk2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-        <xref linkend="dbus"/>,
-        <xref linkend="openssl"/>,
-        <xref linkend="python"/>, and
-        <xref linkend="tcl"/>
-    </para>
+    <para role="optional"><xref linkend="dbus-glib"/>,
+    <xref linkend="openssl"/>,
+    <xref linkend="python"/>, and
+    <xref linkend="tcl"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -91,5 +85,5 @@
 make</userinput></screen>
 
-    <para><application>XChat</application> does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
