diff --git a/ChangeLog b/ChangeLog
index 68defb6f13..8dd6a42ba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-21  Dan Williams  <dcbw@redhat.com>
+
+	* gfilemonitor/inotify-sub.c
+		- (dup_dirname): actually remove trailing '/' (bgo #561807)
+
 2008-11-21  Tambet Ingo  <tambet@gmail.com>
 
 	* system-settings/plugins/ifcfg-suse/parser.c (read_wpa_eap_settings): Make suse
diff --git a/gfilemonitor/inotify-sub.c b/gfilemonitor/inotify-sub.c
index 404dc208ef..2b71c930da 100644
--- a/gfilemonitor/inotify-sub.c
+++ b/gfilemonitor/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;
 }