diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 66b539c7b..b9c5a62a7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mount.cc (fs_names): Add trailing NULL element to avoid potential
+	SEGV in format_proc_filesystems.
+
 2013-03-01  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
 	* exceptions.cc (exception::handle): Eliminate buggy recursed variable;
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 6f0d39ec6..4ff42693d 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1591,7 +1591,8 @@ fs_names_t fs_names[] = {
     { "mvfs", false },
     { "cifs", false },
     { "nwfs", false },
-    { "ncfsd", false }
+    { "ncfsd", false },
+    { NULL, false }
 };
 
 static mntent *