diff --git a/packages/x11/other/uxlaunch/init.d/60_uxlaunch b/packages/x11/other/uxlaunch/init.d/60_uxlaunch
index 9ca440f3d3..316fb8e125 100644
--- a/packages/x11/other/uxlaunch/init.d/60_uxlaunch
+++ b/packages/x11/other/uxlaunch/init.d/60_uxlaunch
@@ -6,8 +6,9 @@ progress "starting uxlaunch"
 
   UX_USER="root"
   UX_TTY="1"
-  XORG_CONF="/etc/X11/xorg.conf"
+  XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
   XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
+  XORG_USER_CONF="/storage/.config/xorg.conf"
 
   if [ "$START_MRXVT" = "yes" -a -f /usr/bin/mrxvt-session ]; then
     UX_SESSION="/usr/bin/mrxvt-session"
@@ -28,13 +29,16 @@ progress "creating directories needed for Xorg"
   if lspci -n | grep 0300 | grep -q 10de; then
     $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
     $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
-    UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
+    XORG_CONF="$XORG_NVIDIA_CONF"
   else
     $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
     $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
-    UX_ARG="$UX_ARG -c $XORG_CONF"
+    XORG_CONF="$XORG_DEFAULT_CONF"
   fi
 
+  [ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"
+  UX_ARG="$UX_ARG -c $XORG_CONF"
+
 progress "starting xsession"
 
   uxlaunch $UX_ARG > /dev/null 2>&1
\ No newline at end of file