diff --git a/conf/xorg.conf.d/10-dummy.conf b/conf/xorg.conf.d/10-dummy.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/conf/xorg.conf.d/10-ignore-devices.conf b/conf/xorg.conf.d/10-ignore-devices.conf
new file mode 100644
index 0000000..d8963a2
--- /dev/null
+++ b/conf/xorg.conf.d/10-ignore-devices.conf
@@ -0,0 +1,10 @@
+# If you connect a display to one of the outputs wired to the Nvidia card, you
+# have to comment this whole file. Note that you can leave it commented even
+# without currently attached monitor, at the cost of greater optirun startup
+# time.
+
+Section "InputClass"
+    Identifier  "IgnoreDevices"
+    MatchDevicePath "/dev/input/event*|/dev/input/mouse*|/dev/input/js*|/dev/input/mice*"
+    Option      "Ignore" "true"
+EndSection
diff --git a/conf/xorg.conf.nouveau b/conf/xorg.conf.nouveau
index 87e48cb..f519141 100644
--- a/conf/xorg.conf.nouveau
+++ b/conf/xorg.conf.nouveau
@@ -1,6 +1,5 @@
 Section "ServerLayout"
     Identifier  "Layout0"
-    Option      "AutoAddDevices" "false"
     Option      "AutoAddGPU" "false"
 EndSection
 
@@ -8,11 +7,11 @@ Section "Device"
     Identifier  "DiscreteNvidia"
     Driver      "nouveau"
 
-#   If the X server does not automatically detect your VGA device,
-#   you can manually set it here.
-#   To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
-#   as you see in the commented example.
-#   This Setting is needed on Ubuntu 13.04.
+#   If the X server does not automatically detect your VGA device, you can
+#   manually set it here.
+#   To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data as
+#   you see in the commented example.
+#   This setting was needed on Ubuntu 13.04 for instance.
 #   BusID "PCI:01:00:0"
 
 EndSection
diff --git a/conf/xorg.conf.nvidia b/conf/xorg.conf.nvidia
index 5bd686e..c526181 100644
--- a/conf/xorg.conf.nvidia
+++ b/conf/xorg.conf.nvidia
@@ -1,6 +1,5 @@
 Section "ServerLayout"
     Identifier  "Layout0"
-    Option      "AutoAddDevices" "false"
     Option      "AutoAddGPU" "false"
 EndSection
 
@@ -9,26 +8,28 @@ Section "Device"
     Driver      "nvidia"
     VendorName  "NVIDIA Corporation"
 
-#   If the X server does not automatically detect your VGA device,
-#   you can manually set it here.
-#   To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data
-#   as you see in the commented example.
-#   This Setting may be needed in some platforms with more than one
-#   nvidia card, which may confuse the proprietary driver (e.g.,
-#   trying to take ownership of the wrong device). Also needed on Ubuntu 13.04.
+#   If the X server does not automatically detect your VGA device, you can
+#   manually set it here.
+#   To get the BusID prop, run `lspci | egrep 'VGA|3D'` and input the data as
+#   you see in the commented example.
+#   This setting may be needed in some platforms with more than one nvidia
+#   card, which may confuse the proprietary driver (e.g., trying to take
+#   ownership of the wrong device). It was also needed on Ubuntu 13.04.
 #   BusID "PCI:01:00:0"
 
-#   Setting ProbeAllGpus to false prevents the new proprietary driver
-#   instance spawned to try to control the integrated graphics card,
-#   which is already being managed outside bumblebee.
-#   This option doesn't hurt and it is required on platforms running
-#   more than one nvidia graphics card with the proprietary driver.
-#   (E.g. Macbook Pro pre-2010 with nVidia 9400M + 9600M GT).
-#   If this option is not set, the new Xorg may blacken the screen and
-#   render it unusable (unless you have some way to run killall Xorg).
+#   Setting ProbeAllGpus to false prevents the new proprietary driver instance
+#   spawned to try to control the integrated graphics card, which is already
+#   being managed outside bumblebee.
+#   This option does not hurt and it is required on platforms running more than
+#   one nvidia graphics card with the proprietary driver (e.g. Macbook Pro
+#   pre-2010 with nVidia 9400M + 9600M GT).
+#   If this option is not set, the new Xorg may blacken the screen and render
+#   it unusable (unless you have some way to run killall Xorg).
     Option "ProbeAllGpus" "false"
 
     Option "NoLogo" "true"
+
+#   Do not probe display properties while there is no expected display.
     Option "UseEDID" "false"
     Option "UseDisplayDevice" "none"
 
@@ -40,4 +41,5 @@ Section "Device"
 #   allowing the X server to start when the monitor is disconnected.
 
 #   Option "AllowEmptyInitialConfiguration"
+
 EndSection