diff --git a/mlocate.spec b/mlocate.spec
index 9c9df9f..1f09df0 100644
--- a/mlocate.spec
+++ b/mlocate.spec
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.22.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 URL: https://fedorahosted.org/mlocate/
 Group: Applications/System
@@ -69,6 +69,11 @@ exit 0
 %ghost %{_localstatedir}/lib/mlocate/mlocate.db
 
 %changelog
+* Fri Jan 15 2010 Miloslav Trmač <mitr@redhat.com> - 0.22.2-2
+- Add "lustre" to PRUNEFS
+- Add all nodev filesystems from the Fedora kernel to PRUNEFS, to make
+  (updatedb) work as some users expect
+
 * Fri Oct  2 2009 Miloslav Trmač <mitr@redhat.com> - 0.22.2-1
 - Update to mlocate-0.22.2
 
diff --git a/updatedb.conf b/updatedb.conf
index a440f0d..5a78f4b 100644
--- a/updatedb.conf
+++ b/updatedb.conf
@@ -1,4 +1,4 @@
 PRUNE_BIND_MOUNTS = "yes"
-PRUNEFS = "auto afs gfs gfs2 iso9660 sfs udf"
+PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs"
 PRUNENAMES = ".git .hg .svn"
 PRUNEPATHS = "/afs /media /net /sfs /tmp /udev /var/cache/ccache /var/spool/cups /var/spool/squid /var/tmp"