diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index b677f5d4a..c15797942 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1607,7 +1607,7 @@ following format:
 for a VGA output)
 .PP
 In the absence of specific association of monitor sections to outputs, if a
-monitor section is present the server will associate it with an output to
+monitor section is present the server will associate it with all outputs to
 preserve compatibility for previous single-head configurations.
 .PP
 Specifying video modes is optional because the server will use the DDC or other
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 902a39104..738b60895 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -651,9 +651,10 @@ xf86OutputCreate(ScrnInfoPtr scrn,
     }
     output->subpixel_order = SubPixelUnknown;
     /*
-     * Use the old per-screen monitor section for the first output
+     * Use the old per-screen monitor section for all outputs that are
+     * not explicitly associated to a given monitor.
      */
-    output->use_screen_monitor = (xf86_config->num_output == 0);
+    output->use_screen_monitor = 1;
 #ifdef RANDR_12_INTERFACE
     output->randr_output = NULL;
 #endif