diff --git a/gio/ChangeLog b/gio/ChangeLog
index 67c6387d4..0ce6cb508 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-10  Frederic Crozat  <fcrozat@mandriva.com>
+
+	* gunixmounts.c: add rpc_pipefs to systemfs list (#508309).
+
 2008-01-09  Murray Cumming  <murrayc@murrayc.com>
 
 	* gfile.c: *_async() functions: Several small corrections 
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 0943220b2..f2b0de2ea 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -273,6 +273,7 @@ guess_system_internal (const char *mountpoint,
     "tmpfs",
     "usbfs",
     "nfsd",
+    "rpc_pipefs",
     NULL
   };
   const char *ignore_devices[] = {