diff --git a/flags.patch b/flags.patch
new file mode 100644
index 0000000..eea35c8
--- /dev/null
+++ b/flags.patch
@@ -0,0 +1,12 @@
+diff -up libxklavier-4.0/libxklavier/xkl_engine.h.flags libxklavier-4.0/libxklavier/xkl_engine.h
+--- libxklavier-4.0/libxklavier/xkl_engine.h.flags	2009-07-09 14:44:22.219289759 -0400
++++ libxklavier-4.0/libxklavier/xkl_engine.h	2009-07-09 14:44:32.981284927 -0400
+@@ -59,7 +59,7 @@ extern "C" {
+  *                                   xkl_start_listen(engine,XKLL_MANAGE_LAYOUTS);
+  *   @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify
+  */
+-	typedef enum {
++	typedef enum { /*< flags >*/
+ 		XKLF_CAN_TOGGLE_INDICATORS = 0x01,
+ 		XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 0x02,
+ 		XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 0x04,
diff --git a/libxklavier.spec b/libxklavier.spec
index 5a65b0c..74b39f7 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	4.0
-Release: 	1%{?dist}
+Release: 	3%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -14,6 +14,8 @@ BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
 Source: http://download.gnome.org/sources/libxklavier/4.0/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugs.freedesktop.org/show_bug.cgi?id=22687
+Patch0: flags.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -35,6 +37,7 @@ needed to develop libxklavier applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .flags
 
 %build
 
@@ -75,6 +78,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Thu Jul  9 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-3
+- Avoid a critical warning at runtime
+
 * Wed Jul 01 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.0-2
 - %%files: track files closer, esp lib sonames
 - %%build: drop --disable-doxygen, add --disable-static, add %%{?_smp_mflags}