diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index 5ac2b12d7c5..a8d2a70dfac 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -76,6 +76,7 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
+  Option       "AutoAddDevices" "0"
 EndSection
 
 
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 062faa06db3..91b30828f7e 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -58,7 +58,7 @@ let
       xorg.xf86inputevdev
     ]
     ++ getAttr ["modules"] [] videoDriverModules
-    ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
 
 
   fontsForXServer =
@@ -447,7 +447,7 @@ rec {
     }
 
     ${if videoDriver != "nvidia"
-      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/modules/dri"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
       else ""
     }