diff --git a/gio/ChangeLog b/gio/ChangeLog
index 2d3f3a00a..879d395e0 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-19  Sebastien Bacher  <seb128@ubuntu.com>
+
+	* gunixmounts.c: (guess_mount_type): 
+	consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS (Closes: #523338)
+
 2008-03-19  Alexander Larsson  <alexl@redhat.com>
 
         * gfile.c:
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index c04cd47e2..eadbf0941 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1595,7 +1595,8 @@ guess_mount_type (const char *mount_path,
       (strcmp (filesystem_type, "iso9660") == 0) ||
       (strcmp (filesystem_type, "cd9660") == 0))
     type = G_UNIX_MOUNT_TYPE_CDROM;
-  else if (strcmp (filesystem_type, "nfs") == 0)
+  else if ((strcmp (filesystem_type, "nfs") == 0) ||
+           (strcmp (filesystem_type, "nfs4") == 0))
     type = G_UNIX_MOUNT_TYPE_NFS;
   else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") ||
 	   g_str_has_prefix (device_path, "/dev/fd") ||