diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure
index 8d6796ad0b..a0b000e487 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
@@ -24,10 +24,17 @@
 # creating needed directories and symlinks
 ################################################################################
 
-logger -t Xorg "creating needed directories and symlinks for driver: "$1""
+mkdir -p /var/lib
+mkdir -p /var/run
 
-  mkdir -p /var/lib
-  mkdir -p /var/run
+# HACK. we have xorg-configure@%. so nice race
+# can happen on multi-gpu setups
+if [ -e /var/run/xorg-configure.done ] ; then
+  exit 0
+fi
+
+touch /var/run/xorg-configure.done
+logger -t Xorg "creating needed directories and symlinks for driver: "$1""
 
 ##############################################################################
 # setup xorg.conf paths