diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 224cb5f..79bb380 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.5.99.903
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -74,9 +74,6 @@ Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 # Workaround RH bug #449944
 Patch5011: xserver-1.4.99-endian.patch
 
-# evdev keyboard map fix
-# Patch5015: xserver-1.5.0-enable-selinux.patch
-
 # force mode debugging on for randr 1.2 drivers
 Patch6002: xserver-1.5.1-mode-debug.patch
 
@@ -97,6 +94,8 @@ Patch6015: xserver-1.5.99.902-vnc.patch
 # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
 Patch6017: xserver-1.5.99.902-nouveau.patch
 
+Patch6018: xserver-1.5.99.903-glx-visual-score.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -513,6 +512,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 18 2009 Adam Jackson <ajax@redhat.com> 1.5.99.903-2
+- xserver-1.5.99.903-glx-visual-score.patch: Fix visual scoring.
+
 * Wed Feb 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.903-1
 - xserver 1.6. RC 3
 - remove patches merged into upstream.
diff --git a/xserver-1.5.99.903-glx-visual-score.patch b/xserver-1.5.99.903-glx-visual-score.patch
new file mode 100644
index 0000000..9b9169a
--- /dev/null
+++ b/xserver-1.5.99.903-glx-visual-score.patch
@@ -0,0 +1,31 @@
+From 4039603413f9f46d7f725463a70b4a51838e0049 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Tue, 17 Feb 2009 08:27:32 -0800
+Subject: [PATCH 01/10] glx: Inialize best_score before calculating visual scores
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This bug was pointed out by Peter Åstrand.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+ glx/glxscreens.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/glx/glxscreens.c b/glx/glxscreens.c
+index 87119fb..6f68b06 100644
+--- a/glx/glxscreens.c
++++ b/glx/glxscreens.c
+@@ -354,7 +354,7 @@ static __GLXconfig *
+ pickFBConfig(__GLXscreen *pGlxScreen, VisualPtr visual)
+ {
+     __GLXconfig *best = NULL, *config;
+-    int best_score;
++    int best_score = 0;
+ 
+     for (config = pGlxScreen->fbconfigs; config != NULL; config = config->next) {
+ 	int score = 0;
+-- 
+1.6.1.3
+