diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index ed0d4f6020..24d1577b5d 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -55,6 +55,9 @@ fi
 # wait for network
   wait_for_inet_addr
 
+# wait for udevadm settle to finish
+  wait_for_udevadm_settle
+
 # set cpu's to 'ondemand'
   ( usleep 15000000
     progress "set cpu's to 'ondemand'"
diff --git a/packages/sysutils/systemd/profile.d/udev.conf b/packages/sysutils/systemd/profile.d/udev.conf
new file mode 100644
index 0000000000..3eeb5ae3ff
--- /dev/null
+++ b/packages/sysutils/systemd/profile.d/udev.conf
@@ -0,0 +1,27 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+wait_for_udevadm_settle () {
+  progress "Wait for udevadm settle to finish"
+  for i in $(seq 1 50) ; do
+    ps | grep -q "[u]devadm settle" || break
+    usleep 200000
+  done
+}