diff --git a/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power b/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power
index 34e79c356c..1d4d4f06e5 100644
--- a/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power
+++ b/packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power
@@ -22,12 +22,20 @@
 
 . /etc/profile
 
+LOCKFILE="/var/lock/boblightd.sleep"
+
 case "$1" in
   hibernate|suspend)
+    progress "Shutting down boblightd for suspending..."
     boblightd.stop
+    touch $LOCKFILE
     ;;
   thaw|resume)
-    xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.boblightd)" &
+    progress "Restarting boblightd for wakeup..."
+    if [ -f "$LOCKFILE" ] ; then
+      rm -rf "$LOCKFILE"
+      boblightd.start
+    fi
     ;;
   *) exit $NA
     ;;