diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index ad6e205..eb96fa5 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -44,6 +44,9 @@ Patch104:	gnome-vfs-2.8.2-browser_default.patch
 
 Patch201: gnome-vfs-2.8.1-console-mount-opt.patch
 
+# This is in upstream cvs:
+Patch400: vfs-inotify-types.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -88,6 +91,8 @@ shares (SMB) to applications using GNOME VFS.
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
+%patch400 -p0 -b .inotify_types
+
 %build
 
 if pkg-config openssl ; then
diff --git a/vfs-inotify-types.patch b/vfs-inotify-types.patch
new file mode 100644
index 0000000..f04b229
--- /dev/null
+++ b/vfs-inotify-types.patch
@@ -0,0 +1,19 @@
+Index: modules/inotify-path.c
+===================================================================
+RCS file: /cvs/gnome/gnome-vfs/modules/inotify-path.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- modules/inotify-path.c	10 Dec 2005 23:50:19 -0000	1.1
++++ modules/inotify-path.c	12 Dec 2005 16:03:49 -0000	1.2
+@@ -24,6 +24,10 @@
+ */
+ 
+ #include "config.h"
++
++/* Don't put conflicting kernel types in the global namespace: */
++#define __KERNEL_STRICT_NAMES
++
+ #include "local_inotify.h"
+ #if 0
+ #ifdef HAVE_SYS_INOTIFY_H