diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f20b7a710d9..cb71b40e067 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-31  Glenn Morris  <rgm@gnu.org>
+
+	* generic-x.el (etc-fstab-generic-mode): Add ext4, sysfs keywords.
+
 2011-03-30  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* progmodes/python.el (python-default-interpreter)
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index bce03331a29..37819599f62 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1705,6 +1705,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "efs"
     "ext2"
     "ext3"
+    "ext4"
     "hfs"
     "hpfs"
     "iso9660"
@@ -1722,6 +1723,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
     "cifs"
     "usbdevfs"
     "sysv"
+    "sysfs"
     "tmpfs"
     "udf"
     "ufs"