diff -urN xorg-server-1.2.0/hw/xfree86/common/xf86Config.c xorg-server-1_1.2.0/hw/xfree86/common/xf86Config.c
--- xorg-server-1.2.0/hw/xfree86/common/xf86Config.c	2007-01-23 00:39:15.000000000 -0500
+++ xorg-server-1_1.2.0/hw/xfree86/common/xf86Config.c	2007-04-28 09:27:13.000000000 -0400
@@ -767,6 +767,7 @@
     FLAG_ESTIMATE_SIZES_AGGRESSIVELY,
     FLAG_NOPM,
     FLAG_XINERAMA,
+    FLAG_ZINERAMAINFO,
     FLAG_ALLOW_DEACTIVATE_GRABS,
     FLAG_ALLOW_CLOSEDOWN_GRABS,
     FLAG_LOG,
@@ -832,6 +833,8 @@
 	{0}, FALSE },
   { FLAG_XINERAMA,		"Xinerama",			OPTV_BOOLEAN,
 	{0}, FALSE },
+  { FLAG_XINERAMAINFO,          "XineramaInfo                   OPTV_STRING,
+        {0}, FALSE },
   { FLAG_ALLOW_DEACTIVATE_GRABS,"AllowDeactivateGrabs",		OPTV_BOOLEAN,
 	{0}, FALSE },
   { FLAG_ALLOW_CLOSEDOWN_GRABS, "AllowClosedownGrabs",		OPTV_BOOLEAN,
@@ -1124,8 +1127,48 @@
       noPanoramiXExtension = !value;
       from = X_CONFIG;
     }
-    if (!noPanoramiXExtension)
+    if (!noPanoramiXExtension) {
+      const char *s;
       xf86Msg(from, "Xinerama: enabled\n");
+      if ((s = xf86GetOptValString(FlagOptions, FLAG_XINERAMAINFO))) {
+	char *b=s;
+	xf86Msg(X_CONFIG, "XineramaInfo: \"%s\"\n", s);
+	do {
+	  char *t=0, *p1=0, *p2=0;
+	  t=index(b,'x');
+	  if(t) {
+	    t++;
+	    p1=index(t,'+');
+	    if(p1) {
+	      p1++;
+	      p2=index(p1,'+');
+	      if(p2) {
+		p2++;
+		if(XineramaInfoScreensNum<16) {
+		  XineramaInfoScreensGeometry[XineramaInfoScreensNum][0]=atoi(b);
+		  XineramaInfoScreensGeometry[XineramaInfoScreensNum][1]=atoi(t);
+		  XineramaInfoScreensGeometry[XineramaInfoScreensNum][2]=atoi(p1);
+		  XineramaInfoScreensGeometry[XineramaInfoScreensNum][3]=atoi(p2);
+		  XineramaInfoScreensNum++;
+		};
+	      };
+	    };
+	  };
+	  b=index(b,',');
+	  if(b) b++;
+	} while(b);
+	do {
+	  int i;
+	  for(i=0;i<XineramaInfoScreensNum;i++) {
+	    xf86Msg(X_CONFIG, "  screen %i: w=%i h=%i x=%i y=%i\n", i,
+		    XineramaInfoScreensGeometry[i][0],
+		    XineramaInfoScreensGeometry[i][1],
+		    XineramaInfoScreensGeometry[i][2],
+		    XineramaInfoScreensGeometry[i][3]);
+	  };
+	} while(0);
+      };
+    };
 #endif
 
     return TRUE;
diff -urN xorg-server-1.2.0/include/globals.h xorg-server-1_1.2.0/include/globals.h
--- xorg-server-1.2.0/include/globals.h	2007-01-23 00:39:17.000000000 -0500
+++ xorg-server-1_1.2.0/include/globals.h	2007-04-28 09:29:17.000000000 -0400
@@ -48,6 +48,8 @@
 extern Bool PanoramiXVisibilityNotifySent;
 extern Bool PanoramiXWindowExposureSent;
 extern Bool PanoramiXOneExposeRequest;
+extern int XineramaInfoScreensNum;
+extern int XineramaInfoScreensGeometry[16][4];
 extern Bool PanoramiXExtensionDisabledHack;
 #endif
 
diff -urN xorg-server-1.2.0/Xext/panoramiX.c xorg-server-1_1.2.0/Xext/panoramiX.c
--- xorg-server-1.2.0/Xext/panoramiX.c	2007-01-23 00:39:15.000000000 -0500
+++ xorg-server-1_1.2.0/Xext/panoramiX.c	2007-04-28 09:40:25.000000000 -0400
@@ -58,6 +58,8 @@
 #endif
 #include "modinit.h"
 
+int XineramaInfoScreensNum;
+int XineramaInfoScreensGeometry[16][4];
 
 #ifdef GLXPROXY
 extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
@@ -1047,10 +1049,14 @@
     {
 	/* The following hack fools clients into thinking that Xinerama
 	 * is disabled even though it is not. */
-	rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
-    }
+#if 0
+    rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
 #else
-    rep.state = !noPanoramiXExtension;
+    rep.state = (!noPanoramiXExtension && !PanoramiXExtensionDisabledHack) || (XineramaInfoScreensNum!=0);
+#endif
+    }
+#else 
+    rep.state = !noPanoramiXextension;
 #endif
     if (client->swapped) {
 	register int n;
@@ -1071,6 +1077,7 @@
 
     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
 
+#if 0
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
     rep.number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens;
@@ -1103,6 +1110,73 @@
 	    WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
 	}
     }
+#else
+    if(XineramaInfoScreensNum!=0) {
+      xXineramaScreenInfo scratch;
+      int i;
+      rep.type = X_Reply;
+      rep.sequenceNumber = client->sequence;
+      rep.number = XineramaInfoScreensNum;
+      rep.length = rep.number * sz_XineramaScreenInfo >> 2;
+      if (client->swapped) {
+	register int n;
+	swaps (&rep.sequenceNumber, n);
+	swapl (&rep.length, n);
+	swapl (&rep.number, n);
+      }	
+      WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
+      
+      for(i = 0; i < XineramaInfoScreensNum; i++) {
+	scratch.x_org  = XineramaInfoScreensGeometry[i][2];
+	scratch.y_org  = XineramaInfoScreensGeometry[i][3];
+	scratch.width  = XineramaInfoScreensGeometry[i][0];
+	scratch.height = XineramaInfoScreensGeometry[i][1];
+	
+	if(client->swapped) {
+	  register int n;
+	  swaps (&scratch.x_org, n);
+	  swaps (&scratch.y_org, n);
+	  swaps (&scratch.width, n);
+	  swaps (&scratch.height, n);
+	}
+	WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
+      }
+    }
+    else {
+      rep.type = X_Reply;
+      rep.sequenceNumber = client->sequence;
+      rep.number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens;
+      rep.length = rep.number * sz_XineramaScreenInfo >> 2;
+      if (client->swapped) {
+	register int n;
+	swaps (&rep.sequenceNumber, n);
+	swapl (&rep.length, n);
+	swapl (&rep.number, n);
+      }	
+      WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
+      
+      if(!noPanoramiXExtension) {
+	xXineramaScreenInfo scratch;
+	int i;
+	
+	for(i = 0; i < PanoramiXNumScreens; i++) {
+	  scratch.x_org  = panoramiXdataPtr[i].x;
+	  scratch.y_org  = panoramiXdataPtr[i].y;
+	  scratch.width  = panoramiXdataPtr[i].width;
+	  scratch.height = panoramiXdataPtr[i].height;
+	  
+	  if(client->swapped) {
+	    register int n;
+	    swaps (&scratch.x_org, n);
+	    swaps (&scratch.y_org, n);
+	    swaps (&scratch.width, n);
+	    swaps (&scratch.height, n);
+	  }
+	  WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
+	}
+      }
+    };
+#endif
 
     return client->noClientException;
 }