diff --git a/packages/addons/service/multimedia/boblightd/build b/packages/addons/service/multimedia/boblightd/build
index 94f9754dc5..6c32ba94a2 100755
--- a/packages/addons/service/multimedia/boblightd/build
+++ b/packages/addons/service/multimedia/boblightd/build
@@ -31,7 +31,6 @@ cd $PKG_BUILD
             --enable-shared \
             --disable-static \
             --without-portaudio \
-            --without-ffmpeg
 
 make
 
diff --git a/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch
new file mode 100644
index 0000000000..aacca116cc
--- /dev/null
+++ b/packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-getopt-includes.patch
@@ -0,0 +1,13 @@
+diff --git a/src/clients/flagmanager.cpp b/src/clients/flagmanager.cpp
+index d9f3cbf..82eb978 100644
+--- a/src/clients/flagmanager.cpp
++++ b/src/clients/flagmanager.cpp
+@@ -25,6 +25,8 @@
+ #define BOBLIGHT_DLOPEN_EXTERN
+ #include "../lib/boblight.h"
+ 
++#include <unistd.h>
++
+ using namespace std;
+ 
+ //very simple, store a copy of argc and argv
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
     ;;