diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 53042ab..6375a4a 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -112,6 +112,8 @@ Patch6033: xserver-1.6.1-activate-device.patch
 Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
 Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch
 
+Patch6040: xserver-1.6.1-vt-switch.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -544,6 +546,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 08 2009 Adam Jackson <ajax@redhat.com> 1.6.1-13
+- xserver-1.6.1-vt-switch.patch: Synthesize key releases on vt switch away,
+  not just on return.  Fixes CPU usage bug while switched away. (#484393)
+
 * Thu May 07 2009 Adam Jackson <ajax@redhat.com> 1.6.1-12
 - xserver-1.6.1-nouveau.patch: AIGLX setup failure is not an error for
   nouveau.
diff --git a/xserver-1.6.1-vt-switch.patch b/xserver-1.6.1-vt-switch.patch
new file mode 100644
index 0000000..e19ec4b
--- /dev/null
+++ b/xserver-1.6.1-vt-switch.patch
@@ -0,0 +1,34 @@
+From 492bfcdc7419a94bd026202b2a2c65541c2e54d2 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 8 May 2009 16:06:23 -0400
+Subject: [PATCH] Fake key releases on vt leave, not just enter
+
+Fixes silly cpu usage bug while vt switched away.
+
+---
+ hw/xfree86/common/xf86Events.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
+index d6ef93a..9923f84 100644
+--- a/hw/xfree86/common/xf86Events.c
++++ b/hw/xfree86/common/xf86Events.c
+@@ -505,10 +505,14 @@ xf86VTSwitch()
+      */
+     pInfo = xf86InputDevs;
+     while (pInfo) {
+-      if (pInfo->dev)
++      if (pInfo->dev) {
++	  xf86ReleaseKeys(pInfo->dev);
+           DisableDevice(pInfo->dev);
++      }
+       pInfo = pInfo->next;
+     }
++    xf86ReleaseKeys(inputInfo.keyboard);
++
+     xf86EnterServerState(SETUP);
+     for (i = 0; i < xf86NumScreens; i++)
+ 	xf86Screens[i]->LeaveVT(i, 0);
+-- 
+1.6.2.2
+