diff --git a/gio/ChangeLog b/gio/ChangeLog
index 7c69a9af4..b383c2540 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-08  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 558298 – Hide ecryptfs mounts
+
+	* gunixmounts.c: (guess_system_internal): Hide ecryptfs mounts, 
+	so that the desktop does not show both the mount and the target 
+	directory. Patch by Martin Pitt
+ 
 2008-12-08  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 555465 – GUnix{Input,Output}Stream lacks fd/close_fd_at_close 
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index cd49ff16f..6b95d74ba 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -263,6 +263,7 @@ guess_system_internal (const char *mountpoint,
     "autofs",
     "devfs",
     "devpts",
+    "ecryptfs",
     "kernfs",
     "linprocfs",
     "proc",