diff --git a/general.ent b/general.ent
index 5238334fd9..d978addf9e 100644
--- a/general.ent
+++ b/general.ent
@@ -612,7 +612,7 @@ $Date$
 <!ENTITY webkitgtk-version            "1.6.1">
 <!ENTITY libsexy-version              "0.1.11">
 <!ENTITY libnotify-version            "0.7.4">
-<!ENTITY notification-daemon-version  "0.4.0">
+<!ENTITY notification-daemon-version  "0.7.3">
 <!ENTITY gtk-vnc-version              "0.4.3">
 <!ENTITY cogl-version                 "1.8.2">
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 71753b45f1..f7b697cdd9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -53,6 +53,9 @@
         <listitem>
           <para>[abenton] - libpng 1.5.8.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge notification-daemon-0.7.3 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/x/lib/notification-daemon.xml b/x/lib/notification-daemon.xml
index fd59c5bfda..8160c8a98e 100644
--- a/x/lib/notification-daemon.xml
+++ b/x/lib/notification-daemon.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY notification-daemon-download-http "http://www.galago-project.org/files/releases/source/notification-daemon/notification-daemon-&notification-daemon-version;.tar.bz2">
-  <!ENTITY notification-daemon-download-ftp  " ">
-  <!ENTITY notification-daemon-md5sum        "e61eff9782551d81045bb53e8a801d58">
-  <!ENTITY notification-daemon-size          "318 KB">
-  <!ENTITY notification-daemon-buildsize     "4 MB">
-  <!ENTITY notification-daemon-time          "0.1 SBU">
+  <!ENTITY notification-daemon-download-http "&gnome-download-http;/notification-daemon/0.7/notification-daemon-&notification-daemon-version;.tar.xz">
+  <!ENTITY notification-daemon-download-ftp "&gnome-download-ftp;/notification-daemon/0.7/notification-daemon-&notification-daemon-version;.tar.xz">
+  <!ENTITY notification-daemon-md5sum        "3cf4b7c286cf898156eeba65c473379c">
+  <!ENTITY notification-daemon-size          "269 KB">
+  <!ENTITY notification-daemon-buildsize     "4.7 MB">
+  <!ENTITY notification-daemon-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="notification-daemon" xreflabel="notification-daemon-&notification-daemon-version;">
@@ -32,6 +32,8 @@
     <para>The <application>notification-daemon</application> package is a daemon
     that displays passive pop-up notifications.</para>
 
+    &lfs70_built;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -79,10 +81,11 @@
 
 <screen><userinput>./configure --prefix=/usr \
             --libexecdir=/usr/lib/notification-daemon-1.0 \
-            --with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas &amp;&amp;
+            --with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package's testsuite is only intended to be used by the
+    maintainer to check i18n files.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -95,11 +98,11 @@ make</userinput></screen>
 
     <para><parameter>--libexecdir=/usr/lib/notification-daemon-1.0</parameter>: This
     parameter is used so that the <application>notification-daemon</application>
-    internal support programs are installed in the preferred location of
+    internal support program is installed in the preferred location of
     <filename class='directory'>/usr/lib/notification-daemon-1.0</filename> instead
     of <filename class='directory'>/usr/libexec</filename>.</para> 
 
-    <para><parameter>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</parameter>:
+    <para><parameter>--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas</parameter>:
     This parameter is used so that the <application>GConf</application> schema
     files are installed into the existing database.</para>
 
@@ -114,10 +117,12 @@ make</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>notification-properties and notification-daemon</seg>
-        <seg>libstandard.{so,a}</seg>
+        <seg><!--notification-properties and -->notification-daemon</seg>
+        <!--<seg>libstandard.{so,a}</seg>
         <seg>/usr/{lib/notification-daemon-1.0/engines,
-        share/notification-daemon}</seg>
+        share/notification-daemon}</seg>-->
+        <seg>None</seg>
+        <seg>/usr/lib/notification-daemon-1.0, /usr/share/notification-daemon</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -126,7 +131,7 @@ make</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="notification-properties">
+      <!--<varlistentry id="notification-properties">
         <term><command>notification-properties</command></term>
         <listitem>
           <para>is a <application>notification-daemon</application> properties
@@ -135,7 +140,7 @@ make</userinput></screen>
             <primary sortas="b-notification-properties">notification-properties</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="notification-daemon-prog">
         <term><command>notification-daemon</command></term>