diff --git a/packages/x11/xserver/xorg-server/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
index 666027d996..ee39f37989 100644
--- a/packages/x11/xserver/xorg-server/conf.d/xorg
+++ b/packages/x11/xserver/xorg-server/conf.d/xorg
@@ -9,6 +9,7 @@
 # X environment variables.
 #-------------------------------------------------------------------------------
 DISPLAY=':0.0'
+XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
 XORG_ARGS="-s 0 -br -noreset -allowMouseOpenFail -nocursor"
 
 export DISPLAY
@@ -17,23 +18,27 @@ export DISPLAY
 # do not change anything below
 #-------------------------------------------------------------------------------
 
+[ $DEBUG = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
+
   start_xorg() {
 
     if lspci -n | grep 0300 | grep -q 10de; then
       progress "Found nVidia card, enabling binary driver as requested"
+
+      [ -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
         ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
+
     else
       progress "Not found nVidia card, enabling OSS driver as requested"
+
       mkdir -p /var/lib
         ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
         ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
     fi
 
-    mkdir -p /var/run
-      acpid 2>&1 > /dev/null
-
     mkdir -p /var/cache/xkb
       exec /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
   }
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 8ea0542414..138c3fdd9f 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -75,5 +75,4 @@ get_graphicdrivers
   done
 
 # Tools
-  $SCRIPTS/install acpid
   $SCRIPTS/install pciutils