diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index f6fd152663..251c1230f9 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -22,5 +22,7 @@
     <setting id="TRANSMISSION_USER" value="openelec" />
     <setting id="TVHEADEND_START" value="false" />
     <setting id="UPDATE_AUTO" value="manual" />
+    <setting id="WAKEUP_MUSICDBUPDATE" value="false" />
+    <setting id="WAKEUP_VIDEODBUPDATE" value="false" />
     <setting id="X11_KEYMAP" value="us" />
 </settings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index af1ab2e97e..b6febb1e07 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -9,6 +9,9 @@
 	<string id="2021">Auto update</string>
 	<string id="2050">LCD/VFD Driver</string>
 	<string id="2051">Te gebruiken LCD Driver</string>
+	<string id="2060">Wakeup</string>
+	<string id="2061">Update Video Database on Wakeup</string>
+	<string id="2062">Update Music Database on Wakeup</string>
 
 	<!-- Netwerk -->
 	<string id="2100">Netwerk</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index f666cff917..68a83ae828 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -9,6 +9,9 @@
 	<string id="2021">Auto update</string>
 	<string id="2050">LCD/VFD</string>
 	<string id="2051">LCD Driver to use</string>
+	<string id="2060">Wakeup</string>
+	<string id="2061">Update Video Database on Wakeup</string>
+	<string id="2062">Update Music Database on Wakeup</string>
 
 	<!-- Network -->
 	<string id="2100">Network</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index a0df776b75..e7b53e7280 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -9,6 +9,9 @@
 	<string id="2021">Mise à jour automatique</string>
 	<string id="2050">LCD/VFD</string>
 	<string id="2051">Pilote LCD</string>
+	<string id="2060">Wakeup</string>
+	<string id="2061">Update Video Database on Wakeup</string>
+	<string id="2062">Update Music Database on Wakeup</string>
 
 	<!-- Network -->
 	<string id="2100">Réseau</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index cf6bdd3bf6..7c1fb3dfcd 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -12,6 +12,10 @@
 		<setting label="2050" type="lsep"/>
 		<setting type="sep" />
 		<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon" sort="yes" default="none" />
+		<setting label="2060" type="lsep"/>
+		<setting type="sep" />
+		<setting id="WAKEUP_VIDEODBUPDATE" type="bool" label="2061" default="false" />
+		<setting id="WAKEUP_MUSICDBUPDATE" type="bool" label="2062" default="false" />
     </category>
 
    <!-- Network -->
diff --git a/packages/mediacenter/xbmc/sleep.d/01_update_videodb b/packages/mediacenter/xbmc/sleep.d/01_update_videodb
index 032d6f0531..ee72bfee67 100755
--- a/packages/mediacenter/xbmc/sleep.d/01_update_videodb
+++ b/packages/mediacenter/xbmc/sleep.d/01_update_videodb
@@ -22,11 +22,18 @@
 
 . /etc/profile
 
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+
 case "$1" in
   thaw|resume)
     (
-      usleep 5000000
-      xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)"
+      if [ -f "$OPENELEC_SETTINGS" ]; then
+        VIDEODBUPDATE=`grep WAKEUP_VIDEODBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+        if [ "$VIDEODBUPDATE" = "true" ]; then
+          usleep 5000000
+          xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)"
+        fi
+      fi
     )&
     ;;
   *) exit $NA
diff --git a/packages/mediacenter/xbmc/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc/sleep.d/02_update_musicdb
index f000ffcb67..7abc8c90da 100755
--- a/packages/mediacenter/xbmc/sleep.d/02_update_musicdb
+++ b/packages/mediacenter/xbmc/sleep.d/02_update_musicdb
@@ -22,11 +22,18 @@
 
 . /etc/profile
 
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+
 case "$1" in
   thaw|resume)
     (
-      usleep 5000000
-      xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)"
+      if [ -f "$OPENELEC_SETTINGS" ]; then
+        MUSICDBUPDATE=`grep WAKEUP_MUSICDBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+        if [ "$MUSICDBUPDATE" = "true" ]; then
+          usleep 5000000
+          xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)"
+        fi
+      fi
     )&
     ;;
   *) exit $NA