diff --git a/gio/ChangeLog b/gio/ChangeLog
index 78dc1972c..01fc6f15b 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 561807 – inotify_sub.c :: dup_dirname() fails to 
+	remove trailing '/'
+
+	* inotify/inotify-sub.c (dup_dirname): Actually strip
+	the trailing '/' away. Spotted by Dan Williams.
+
+
 2008-11-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.18.3 ===
diff --git a/gio/inotify/inotify-sub.c b/gio/inotify/inotify-sub.c
index 404dc208e..2b71c930d 100644
--- a/gio/inotify/inotify-sub.c
+++ b/gio/inotify/inotify-sub.c
@@ -38,8 +38,8 @@ dup_dirname (const gchar *dirname)
   gchar *d_dirname = g_strdup (dirname);
   size_t len = strlen (d_dirname);
   
-  if (d_dirname[len] == '/')
-    d_dirname[len] = '\0';
+  if (d_dirname[len - 1] == '/')
+    d_dirname[len - 1] = '\0';
   
   return d_dirname;
 }