diff --git a/installer/nixos-checkout.sh b/installer/nixos-checkout.sh
index b4767d292e10..c9658f66c6da 100644
--- a/installer/nixos-checkout.sh
+++ b/installer/nixos-checkout.sh
@@ -21,14 +21,15 @@ if test -e nixpkgs -a ! -e nixpkgs/.svn; then
     mv nixpkgs nixpkgs-$backupTimestamp
 fi
 
-if test -e nixos/services -a ! -e nixos/services/.svn; then
+if test -e services -a ! -e services/.svn; then
     mv nixos/services services-$backupTimestamp
 fi
 
 # Check out the NixOS and Nixpkgs sources.
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk nixos
 svn co https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk nixpkgs
-svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk nixos/services
+svn co https://svn.cs.uu.nl:12443/repos/trace/services/trunk services
+ln -sf services nixos/services
 
 # A few symlink.
 ln -sfn ../nixpkgs/pkgs nixos/pkgs
diff --git a/system/options.nix b/system/options.nix
index 75ddec16cc45..c43c91098fc5 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -650,6 +650,14 @@
     ";
   }
 
+	{
+		name = ["services" "xserver" "renderingFlag"];
+		default = "";
+		example = "--indirect-rendering";
+		description = "
+			Possibly pass --indierct-rendering to Compiz.
+		";
+	}
   
   {
     name = ["services" "xserver" "sessionStarter"];
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ce0ed82c1d8c..06f9492e2430 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -38,6 +38,7 @@ let
   resolutions = map (res: "\"${toString res.x}x${toString res.y}\"") (getCfg "resolutions");
   sessionType = getCfg "sessionType";
   sessionStarter = getCfg "sessionStarter";
+  renderingFlag = getCfg "renderingFlag";
 
 
   sessionCmd =
@@ -238,7 +239,7 @@ let
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${libX11}/lib:${libXext}/lib:/usr/lib/
-      ${compiz}/bin/compiz gconf &
+      ${compiz}/bin/compiz gconf ${renderingFlag}&
       ${compiz}/bin/gtk-window-decorator --sync &
     "
     #else if windowManager == "beryl" then "