diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8b1d59ea40f..ce0ed82c1d8 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -170,6 +170,12 @@ let
         export device=
         export extensions=
       fi
+	
+	if [ \"${toString videoDriver}\" = i810 ]; then
+		extensions='
+	Option \"Composite\" \"Enable\"
+';
+	fi;
 
       substituteAll $src $out
     ";