diff --git a/xorg-x11-server-1.1.1-glcore-visual-matching.patch b/xorg-x11-server-1.1.1-glcore-visual-matching.patch
new file mode 100644
index 0000000..a10f869
--- /dev/null
+++ b/xorg-x11-server-1.1.1-glcore-visual-matching.patch
@@ -0,0 +1,29 @@
+--- xorg-server-1.1.1/GL/mesa/X/xf86glx.c.glcore-visual	2006-07-05 14:31:36.000000000 -0400
++++ xorg-server-1.1.1/GL/mesa/X/xf86glx.c	2006-12-11 12:14:30.000000000 -0500
+@@ -311,17 +311,22 @@
+ {
+     __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
+     const __GLcontextModes *modes;
+-    unsigned i = 0;
++    XMesaVisual *xmv;
+ 
+     for ( modes = screen->modes ; modes != NULL ; modes = modes->next ) {
+ 	if ( modes->visualID == vid ) {
+ 	    break;
+ 	}
+-
+-	i++;
+     }
+ 
+-    return (modes != NULL) ? mesaScreen->xm_vis[i] : NULL;
++    if (!modes)
++	return NULL;
++
++    for (xmv = mesaScreen->xm_vis; xmv; xmv++)
++	if ((*xmv)->mesa_visual.visualID == vid)
++	    return *xmv;
++
++    return NULL;
+ }
+ 
+ static void init_screen_visuals(__GLXMESAscreen *screen)
diff --git a/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch b/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
index 694963b..abfa9de 100644
--- a/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
+++ b/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
@@ -1,5 +1,5 @@
 --- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c.vt-activate	2006-07-05 14:31:41.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c	2006-12-04 17:29:47.000000000 -0500
++++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c	2006-12-14 22:00:25.000000000 -0500
 @@ -248,14 +248,20 @@
  #endif
  	    /*
@@ -25,3 +25,13 @@
  
  	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
  	        FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
+@@ -352,6 +358,9 @@
+ 	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0)
+ 	        xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
+ 		        strerror(errno));
++	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT) < 0)
++	        xf86Msg(X_WARNING, "xf86CloseConsole: VT_WAITACTIVE failed: %s\n",
++		        strerror(errno));
+ 	    activeVT = -1;
+         }
+ 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index f0625a0..729ac09 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -8,7 +8,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   55%{?dist}
+Release:   56%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -35,6 +35,7 @@ Patch14:   xorg-x11-server-1.1.1-ia64-pci-chipsets.patch
 Patch15:   xorg-x11-server-1.1.1-automake-1.10-fixes.patch
 Patch16:   xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
 Patch17:   xorg-x11-server-1.1.1-lid-close-crash.patch
+Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -68,6 +69,7 @@ Patch2007:  xorg-x11-server-1.1.1-aiglx-locking.patch
 Patch2008:  xorg-x11-server-1.1.1-edid-hex-dump.patch
 
 Patch3000:  xorg-x11-server-1.1.1-autoconfig.patch
+Patch3001:  xorg-x11-server-1.1.1-maxpixclock-option.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -340,6 +342,7 @@ drivers, input drivers, or other X modules should install this package.
 %patch15 -p1 -b .automake-1.10
 %patch16 -p1 -b .xkb-vidmode-switch
 %patch17 -p1 -b .lid-close-crash
+%patch18 -p1 -b .glcore-visual
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -369,6 +372,7 @@ drivers, input drivers, or other X modules should install this package.
 %patch2008 -p1 -b .hexdump
 
 %patch3000 -p1 -b .autoconfig
+%patch3001 -p1 -b .maxpixclock
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -683,6 +687,16 @@ rm -rf $RPM_BUILD_ROOT
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Dec 18 2006 Adam Jackson <ajax@redhat.com> 1.1.1-56
+- RHEL5 sync:
+  - xorg-x11-server-1.1.1-maxpixclock-option.patch: Allow the maximum pixel
+    clock of a monitor to be specified in the config file.
+  - xorg-x11-server-1.1.1-glcore-visual-matching.patch: Fix a client crash
+    when creating software indirect GLX contexts.
+  - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: During server
+    init, abort if either VT activation ioctl fails.  During shutdown, be
+    sure to wait for the VT switch to finish before exiting.
+
 * Mon Dec 11 2006 Adam Jackson <ajax@redhat.com> 1.1.1-55
 - xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
   (#197921)