diff --git a/packages/x11/util/xorg-launch-helper/package.mk b/packages/x11/util/xorg-launch-helper/package.mk
index 5d6ae1521e..6733e2d201 100644
--- a/packages/x11/util/xorg-launch-helper/package.mk
+++ b/packages/x11/util/xorg-launch-helper/package.mk
@@ -37,4 +37,6 @@ export LIBS="-lsystemd"
 post_makeinstall_target() {
   # do not install systemd services
   rm -rf $INSTALL/usr/lib
+  mkdir -p $INSTALL/usr/bin
+  cp -P $PKG_DIR/scripts/xorg-launch $INSTALL/usr/bin
 }
diff --git a/packages/x11/util/xorg-launch-helper/scripts/xorg-launch b/packages/x11/util/xorg-launch-helper/scripts/xorg-launch
new file mode 100755
index 0000000000..1534c76e2f
--- /dev/null
+++ b/packages/x11/util/xorg-launch-helper/scripts/xorg-launch
@@ -0,0 +1,41 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+# wait for xorg-configure@.service
+# max 10 seconds
+ARGS_FILE="/run/openelec/xorg-settings.conf"
+for i in $(seq 1 40) ; do
+  if [ -e "$ARGS_FILE" ] ; then
+    break
+  fi
+  usleep 250000
+done
+
+if [ -e "$ARGS_FILE" ] ; then
+  . /run/openelec/xorg-settings.conf
+  exec xorg-launch-helper $@ $XORG_ARGS
+else
+  echo "" > /dev/tty1
+  echo "failed to start xorg." > /dev/tty1
+  echo "is your GPU supported?" > /dev/tty1
+  echo "" > /dev/tty1
+  lspci -nn > /dev/tty1
+  echo "" > /dev/tty1
+  sleep 30
+fi