diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 8c2b247..eb21008 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1341,11 +1341,23 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	 * Check connection status
 	 */
 	output->status = (*output->funcs->detect)(output);
+	xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		   "output %s connection status :%d\n",
+		   output->name, output->status);
 
 	if (output->status == XF86OutputStatusDisconnected)
 	{
-	    xf86OutputSetEDID (output, NULL);
-	    continue;
+	    Bool enabled;
+
+	    enabled = xf86ReturnOptValBool(output->options,
+		    			   OPTION_ENABLE, FALSE);
+	    if (!enabled) {
+		xf86OutputSetEDID (output, NULL);
+		continue;
+	    }
+	    xf86DrvMsg(scrn->scrnIndex, X_INFO,
+		       "output %s not connected, but enabled by config file\n",
+		       output->name);
 	}
 
 	memset (&mon_rec, '\0', sizeof (mon_rec));