diff -u dbus-1.1.20/debian/changelog dbus-1.1.20/debian/changelog
--- dbus-1.1.20/debian/changelog
+++ dbus-1.1.20/debian/changelog
@@ -1,3 +1,15 @@
+dbus (1.1.20-1ubuntu2) hardy-proposed; urgency=low
+
+  * Add debian/patches/03_fix_inotify.patch:
+    - Fix overly aggressive inotifying of /etc/dbus/, breaking proper pickup
+      of configuration file changes. With this fix, newly installed files in
+      /etc/dbus/system.d/ become immediately active again, as in previous
+      versions. (LP: #221834)
+    - The patch also fixes syntax errors in the debugging statements.
+    - Patch backported from 1.2.1, thanks to John Carr!
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 14 May 2008 16:22:37 +0200
+
 dbus (1.1.20-1ubuntu1) hardy; urgency=low
 
   * New upstream release: Tons of bug fixes, a security fix (CVE-2008-0595),
only in patch2:
unchanged:
--- dbus-1.1.20.orig/debian/patches/03_fix_inotify.patch
+++ dbus-1.1.20/debian/patches/03_fix_inotify.patch
@@ -0,0 +1,34 @@
+# Description: Fix watching of configuration files, and fix error
+#  message printing.
+# Upstream: Fixed in 1.2.1.
+# Ubuntu: https://launchpad.net/bugs/221834
+--- dbus-1.1.20.orig/bus/dir-watch-inotify.c
++++ dbus-1.1.20/bus/dir-watch-inotify.c
+@@ -64,7 +64,7 @@
+ 
+   ret = read (inotify_fd, buffer, INOTIFY_BUF_LEN);
+   if (ret < 0)
+-    _dbus_verbose ("Error reading inotify event: '%s'\n, _dbus_strerror(errno)");
++    _dbus_verbose ("Error reading inotify event: '%s'\n", _dbus_strerror(errno));
+   else if (!ret)
+     _dbus_verbose ("Error reading inotify event: buffer too small\n");
+ 
+@@ -134,7 +134,7 @@
+       goto out;
+     }
+ 
+-  wd = inotify_add_watch (inotify_fd, dir, IN_MODIFY | IN_CREATE | IN_DELETE);
++  wd = inotify_add_watch (inotify_fd, dir, IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_TO | IN_MOVED_FROM);
+   if (wd < 0)
+     {
+       _dbus_warn ("Cannot setup inotify for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
+@@ -156,7 +156,7 @@
+   _dbus_verbose ("Dropping all watches on config directories\n");
+   ret = close (inotify_fd);
+   if (ret)
+-    _dbus_verbose ("Error dropping watches: '%s'\n", perror(ret));
++    _dbus_verbose ("Error dropping watches: '%s'\n",  _dbus_strerror(errno));
+ 
+   num_wds = 0;
+   inotify_fd = -1;
+