diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index abf8ba6..bc36b09 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,6 +42,7 @@ Patch19:   xserver-1.3.0-xnest-exposures.patch
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
+Patch102:  xserver-1.4.99-engage-composite-crack-mode.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -510,6 +511,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 16 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.1-0.16
+- Add xserver-1.4.99-engage-composite-crack-mode.patch to better hide
+  protocol side effects such as loss of grabs and focus when
+  redirecting/unredirecting windows (#350271).
+
 * Mon Jan 07 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.15
 - Today's git snapshot.  X-SELinux!
 - Drop the code to migrate from /etc/X11/XF86Config*.
diff --git a/xserver-1.4.99-engage-composite-crack-mode.patch b/xserver-1.4.99-engage-composite-crack-mode.patch
new file mode 100644
index 0000000..b48027b
--- /dev/null
+++ b/xserver-1.4.99-engage-composite-crack-mode.patch
@@ -0,0 +1,26 @@
+From f5be9cb93c3a85572d741d56acb891bb56faf6a0 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
+Date: Wed, 16 Jan 2008 20:24:11 -0500
+Subject: [PATCH] Don't break grab and focus state for a window when redirecting it.
+
+---
+ dix/window.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/dix/window.c b/dix/window.c
+index f65fb84..ccfec2b 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -3022,7 +3022,8 @@ UnrealizeTree(
+ 	    } 
+ #endif
+ 	    (* Unrealize)(pChild);
+-	    DeleteWindowFromAnyEvents(pChild, FALSE);
++	    if (MapUnmapEventsEnabled(pWin))
++		DeleteWindowFromAnyEvents(pChild, FALSE);
+ 	    if (pChild->viewable)
+ 	    {
+ #ifdef DO_SAVE_UNDERS
+-- 
+1.5.3.7
+