diff --git a/Changelog b/Changelog
index 94078e9..cb364ef 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,8 @@ GKrellM Changelog
 	  GnuTLS < 2.12. This allows using GKrellM with GnuTLS versions built
 	  against Nettle instead of Libgcrypt.
 	* Patch from Gerard Neil: Skip autofs mounts in free disk space polling
+	* Patch from Gerard Neil: Handle cifs as remote filesystem to use longer
+	  nfs-timeout polling interval
 
 2.3.5 - Thu Oct 7, 2010
 ------------------------
diff --git a/server/monitor.c b/server/monitor.c
index 2ca2156..598839c 100644
--- a/server/monitor.c
+++ b/server/monitor.c
@@ -1328,6 +1328,7 @@ static gboolean	nfs_check,
 
 static gchar *remote_fs_types[] =
 	{
+	"cifs",
 	"nfs",
 	"smbfs"
 	};
diff --git a/src/fs.c b/src/fs.c
index 887cc0b..2575848 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -162,6 +162,7 @@ static gint		style_id;
 
 static gchar *remote_fs_types[]	=
 	{
+	"cifs",
 	"nfs",
 	"smbfs"
 	};