diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index a4edb20..d6f23cf 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.7.1
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -76,6 +76,7 @@ Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
 Patch6047: xserver-1.7.0-glx-versioning.patch
 Patch6048: xserver-1.7.0-exa-fix-mixed.patch
+Patch6049: xserver-1.7.1-multilib.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -504,6 +505,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Oct 29 2009 Adam Jackson <ajax@redhat.com> 1.7.1-2
+- xserver-1.7.1-multilib.patch: Fix silly multilib issue. (#470885)
+
 * Mon Oct 26 2009 Adam Jackson <ajax@redhat.com> 1.7.1-1
 - xserver 1.7.1
 
diff --git a/xserver-1.7.1-multilib.patch b/xserver-1.7.1-multilib.patch
new file mode 100644
index 0000000..45ea69f
--- /dev/null
+++ b/xserver-1.7.1-multilib.patch
@@ -0,0 +1,52 @@
+From 566ed8932ab153e8918b4496a0ac1765beb4e7e9 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 29 Oct 2009 19:04:10 -0400
+Subject: [PATCH] multilib fix for -devel subpackage
+
+---
+ include/colormapst.h     |    6 ++++--
+ include/xorg-server.h.in |    3 ---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/include/colormapst.h b/include/colormapst.h
+index f1fc8eb..c4a1710 100644
+--- a/include/colormapst.h
++++ b/include/colormapst.h
+@@ -99,16 +99,18 @@ typedef struct _CMEntry
+  * The padN variables are unfortunate ABI BC. See fdo bug #6924.
+  */
+ 
++#define LP64 (__SIZEOF_LONG__ == 8)
++
+ typedef struct _ColormapRec
+ {
+     VisualPtr	pVisual;
+     short	class;		/* PseudoColor or DirectColor */
+-#if defined(_XSERVER64)
++#if LP64
+     short	pad0;
+     XID		pad1;
+ #endif
+     XID		mid;		/* client's name for colormap */
+-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
++#if LP64 && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+     XID		pad2;
+ #endif
+     ScreenPtr	pScreen;	/* screen map is associated with */
+diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
+index 76cab16..3e79529 100644
+--- a/include/xorg-server.h.in
++++ b/include/xorg-server.h.in
+@@ -157,9 +157,6 @@
+ /* Name of X server */
+ #undef __XSERVERNAME__
+ 
+-/* Define to 1 if unsigned long is 64 bits. */
+-#undef _XSERVER64
+-
+ /* Building vgahw module */
+ #undef WITH_VGAHW
+ 
+-- 
+1.6.4.4
+