diff --git a/packages/x11/driver/xf86-video-nvidia/config/51-video-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/51-video-nvidia.conf
new file mode 100644
index 0000000000..49cb189a4a
--- /dev/null
+++ b/packages/x11/driver/xf86-video-nvidia/config/51-video-nvidia.conf
@@ -0,0 +1,5 @@
+Section "Device"
+    Identifier  "Card0"
+    Option "NoLogo" "True"
+    Option "ConnectToAcpid" "False"
+EndSection
diff --git a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
deleted file mode 100644
index 686376dbf7..0000000000
--- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-	Identifier  "Card0"
-	Option "NoLogo" "True"
-	Option "ConnectToAcpid" "False"
-EndSection
diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index 93b9daa73d..713e3231f6 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -15,8 +15,8 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
 mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
   cp $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
 
-mkdir -p $INSTALL/etc/X11
-  cp $PKG_DIR/config/xorg-nvidia.conf $INSTALL/etc/X11
+mkdir -p $INSTALL/etc/X11/xorg.conf.d
+  cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
 
 mkdir -p $INSTALL/usr/lib
   cp $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1
diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index d139c0ff61..28ad50f844 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -9,7 +9,6 @@
 # X environment variables.
 #-------------------------------------------------------------------------------
 DISPLAY=':0.0'
-XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
 
 export DISPLAY
@@ -26,7 +25,6 @@ export DISPLAY
       progress "Found nVidia card, enabling binary driver as requested"
 
       XORG_ARGS="$XORG_ARGS -ignoreABI"
-      [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
 
       mkdir -p /var/lib
         ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so