diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7ed5afa..dbaccc6 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.901
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -492,6 +492,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3
+- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again
+
 * Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
 - rebuild against new openssl
 
diff --git a/xserver-1.5.99.3-broken-mtrr-header.patch b/xserver-1.5.99.3-broken-mtrr-header.patch
index beabcfc..af0c6ef 100644
--- a/xserver-1.5.99.3-broken-mtrr-header.patch
+++ b/xserver-1.5.99.3-broken-mtrr-header.patch
@@ -16,8 +16,8 @@ index 60e8ae1..537d740 100644
  #include <unistd.h>
  #include <sys/mman.h>
  #ifdef HAVE_ASM_MTRR_H
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif
  
@@ -29,8 +29,8 @@ index 688106a..535c3a0 100644
  #endif
  
  #ifdef HAS_MTRR_SUPPORT
-+typedef unsigned char u8;
-+typedef unsigned int u32;
++typedef unsigned char __u8;
++typedef unsigned int __u32;
  #include <asm/mtrr.h>
  #endif