diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 7865577cd06..d8f6cb0f905 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -12,13 +12,13 @@ EndSection
 
 
 Section "Module"
-  Load "i2c"
   Load "bitmap"
-  Load "ddc"
+  Load "dbe"
+  Load "extmod"
   Load "freetype"
   Load "int10"
+  Load "type1"
   Load "vbe"
-
   @moduleSection@
 EndSection
 
@@ -74,6 +74,7 @@ Section "Device"
   Identifier   "Device[0]"
   Driver       "@videoDriver@"
   Option       "Clone" "On"
+  #Option       "MonitorLayout" "CRT,LFP"
   Option       "MonitorLayout" "LVDS,CRT"
   @device@
 EndSection