diff --git a/libxklavier.spec b/libxklavier.spec
index 9b6b37a..3ac0322 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: 	4%{?dist}
+Release: 	5%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -16,6 +16,8 @@ Source: http://download.gnome.org/sources/libxklavier/4.0/%{name}-%{version}.tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24285
+Patch1: xklavier-handle-baddrawable.patch
 
 %description
 libxklavier is a library providing a high-level API for the X Keyboard
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen@redhat.com> - 4.0-5
+- Handle BadDrawable errors gracefully
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/xklavier-handle-baddrawable.patch b/xklavier-handle-baddrawable.patch
new file mode 100644
index 0000000..13f46b8
--- /dev/null
+++ b/xklavier-handle-baddrawable.patch
@@ -0,0 +1,11 @@
+diff -up libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable libxklavier-4.0/libxklavier/xklavier_evt.c
+--- libxklavier-4.0/libxklavier/xklavier_evt.c.baddrawable	2009-10-02 22:31:01.074772988 -0400
++++ libxklavier-4.0/libxklavier/xklavier_evt.c	2009-10-02 22:31:35.755551422 -0400
+@@ -476,6 +476,7 @@ xkl_process_error(Display * dpy, XErrorE
+ 
+ 	switch (evt->error_code) {
+ 	case BadWindow:
++	case BadDrawable:
+ 	case BadAccess:
+ 		{
+ 			XGetErrorText(evt->display, evt->error_code, buf,