diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c

--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.da	2007-09-26 17:04:02.000000000 +1000

+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-09-26 17:04:27.000000000 +1000

@@ -401,8 +401,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr 

     Monitor->DDC = DDC;

-    Monitor->widthmm = 10 * DDC->features.hsize;

-    Monitor->heightmm = 10 * DDC->features.vsize;

+    if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {

+        Monitor->widthmm = 10 * DDC->features.hsize;

+        Monitor->heightmm = 10 * DDC->features.vsize;

+    }

     /* If this is a digital display, then we can use reduced blanking */

     if (DDC->features.input_type)