diff --git a/autoconfig_fallback_fbdev_first.diff b/autoconfig_fallback_fbdev_first.diff
new file mode 100644
index 0000000..1414884
--- /dev/null
+++ b/autoconfig_fallback_fbdev_first.diff
@@ -0,0 +1,20 @@
+--- hw/xfree86/common/xf86AutoConfig.c.orig	2009-06-04 15:36:33.000000000 +0000
++++ hw/xfree86/common/xf86AutoConfig.c	2009-06-04 15:38:22.000000000 +0000
+@@ -521,7 +524,7 @@ listPossibleVideoDrivers(char *matches[]
+     /* Fallback to platform default hardware */
+     if (i < (nmatches - 1)) {
+ #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+-	matches[i++] = xnfstrdup("vesa");
++	matches[i++] = xnfstrdup("fbdev");
+ #elif defined(__sparc__) && !defined(sun)
+ 	matches[i++] = xnfstrdup("sunffb");
+ #endif
+@@ -532,7 +535,7 @@ listPossibleVideoDrivers(char *matches[]
+ #if !defined(__linux__) && defined(__sparc__)
+ 	matches[i++] = xnfstrdup("wsfb");
+ #else
+-	matches[i++] = xnfstrdup("fbdev");
++	matches[i++] = xnfstrdup("vesa");
+ #endif
+     }
+ }
diff --git a/keyrelease-1.5.2.diff b/keyrelease-1.5.2.diff
new file mode 100644
index 0000000..0153638
--- /dev/null
+++ b/keyrelease-1.5.2.diff
@@ -0,0 +1,22 @@
+Index: xorg-server-1.5.2/xkb/xkbPrKeyEv.c
+===================================================================
+--- xorg-server-1.5.2.orig/xkb/xkbPrKeyEv.c
++++ xorg-server-1.5.2/xkb/xkbPrKeyEv.c
+@@ -96,17 +96,6 @@ int             xiEvent;
+ 		else if ((xE->u.u.type==KeyRelease || 
+                             xE->u.u.type == DeviceKeyRelease) &&
+ 			(!(keyc->down[key>>3]&(1<<(key&7))))) {
+-		    XkbLastRepeatEvent=	(pointer)&xE;
+-                    if (xiEvent)
+-                        xE->u.u.type = DeviceKeyPress;
+-                    else
+-                        xE->u.u.type = KeyPress;
+-		    XkbHandleActions(keybd,keybd,xE,count);
+-                    if (xiEvent)
+-                        xE->u.u.type = DeviceKeyRelease;
+-                    else
+-                        xE->u.u.type = KeyRelease;
+-		    XkbHandleActions(keybd,keybd,xE,count);
+ 		    XkbLastRepeatEvent= NULL;
+ 		    return;
+ 		}
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index d8c3300..597899f 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jun  5 21:29:12 CEST 2009 - sndirsch@suse.de
+
+- keyrelease-git.diff
+  * xkb: Don't press+release keys on key events. Fixes submission
+    of F7 to apps on switch from console for drivers that switch
+    fast enough (bnc #141443).
+
+-------------------------------------------------------------------
+Thu Jun  4 17:41:14 CEST 2009 - sndirsch@suse.de
+
+- autoconfig_fallback_fbdev_first.diff
+  * fallback to fbdev first, then vesa instead of the other way
+    round 
+
 -------------------------------------------------------------------
 Tue Jun  2 19:02:02 CEST 2009 - eich@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3b225aa..7d13dbd 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -32,7 +32,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        38
+Release:        39
 License:        GPL v2 or later; X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -114,6 +114,8 @@ Patch132:       fixed-SYNC-extension-trigger-BlockHandler-test.diff
 Patch140:       fbdev_fallback_fail_fix.diff
 Patch141:       bug-507190_xorg-x11-server-bnc381139-randr-fix-timestamps.diff
 Patch142:       bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
+Patch143:       autoconfig_fallback_fbdev_first.diff
+Patch144:       keyrelease-1.5.2.diff
 Patch160:       libdri_noPanoramiXExtension_symbol.patch
 Patch161:       cache-xkbcomp-output-for-fast-start-up.patch
 Patch162:       xserver-boottime.patch
@@ -144,7 +146,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
 
 %package sdk
 License:        GPL v2 or later; X11/MIT
-Summary:        X.Org Server SDK.
+Summary:        X.Org Server SDK
 Group:          System/Libraries
 Provides:       xorg-x11-sdk
 Obsoletes:      xorg-x11-sdk
@@ -243,6 +245,8 @@ cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common
 %patch140 -p1
 %patch141 -p1
 %patch142 -p1
+%patch143 -p0
+%patch144 -p1
 %patch160 -p1
 %patch161 -p1
 # %patch162 -p1
@@ -574,6 +578,15 @@ exit 0
 %endif
 
 %changelog
+* Fri Jun 05 2009 sndirsch@suse.de
+- keyrelease-git.diff
+  * xkb: Don't press+release keys on key events. Fixes submission
+  of F7 to apps on switch from console for drivers that switch
+  fast enough (bnc #141443).
+* Thu Jun 04 2009 sndirsch@suse.de
+- autoconfig_fallback_fbdev_first.diff
+  * fallback to fbdev first, then vesa instead of the other way
+  round
 * Tue Jun 02 2009 eich@suse.de
   Frederico's patches to support reprobing of connected displays on EnterVT
   and fixes to set event timestamps properly.