diff --git a/packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service b/packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service
index b870903972..725c7c8af7 100644
--- a/packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service
+++ b/packages/mediacenter/xbmc/system.d/xbmc-waitonnetwork.service
@@ -8,8 +8,9 @@ ConditionPathExists=/storage/.cache/openelec/network_wait
 
 [Service]
 Type=oneshot
-ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ..."
-ExecStart=/usr/bin/cm-online --timeout=30
+EnvironmentFile=/storage/.cache/openelec/network_wait
+ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ... (max. $WAIT_NETWORK_TIME sec.)"
+ExecStart=/usr/bin/cm-online --timeout=${WAIT_NETWORK_TIME}
 StandardOutput=tty
 
 [Install]