diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build
index cf182af5f3..a204715ec7 100755
--- a/packages/mediacenter/xbmc-pvr/build
+++ b/packages/mediacenter/xbmc-pvr/build
@@ -46,12 +46,6 @@ else
   XBMC_DVDCSS="--disable-dvdcss"
 fi
 
-if [ "$FAAC_SUPPORT" = yes ]; then
-  XBMC_FAAC="--enable-faac"
-else
-  XBMC_FAAC="--disable-faac"
-fi
-
 if [ "$AVAHI_DAEMON" = yes ]; then
   XBMC_AVAHI="--enable-avahi"
 else
@@ -125,7 +119,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
             --exec-prefix=/usr \
             --sysconfdir=/etc \
             --datadir=/usr/share \
-            SVN_REV=`cat svn.version` \
+            GIT_REV=`cat git.version` \
             --disable-debug \
             --disable-optimizations \
             --enable-gl \
@@ -142,7 +136,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
             --disable-ccache \
             $XBMC_PULSEAUDIO \
             --enable-ffmpeg-libvorbis \
-            $XBMC_FAAC \
+            --disable-faac \
             $XBMC_DVDCSS \
             --disable-mid \
             $XBMC_AVAHI \
diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install
index fb79bf15df..58d9f182bf 100755
--- a/packages/mediacenter/xbmc-pvr/install
+++ b/packages/mediacenter/xbmc-pvr/install
@@ -3,7 +3,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011-2011 Gregor Fuis (gujs@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
@@ -65,13 +64,15 @@ mkdir -p $INSTALL/usr/share/xbmc/addons
 mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
   cp -R $PKG_BUILD/tools/EventClients/lib/python/* $PYTHON_LIBDIR/site-packages/xbmc
 
+# install powermanagement hooks
+  mkdir -p $INSTALL/etc/pm/sleep.d
+    cp $PKG_DIR/sleep.d/* $INSTALL/etc/pm/sleep.d
+
 if [ "$WIIMOTE_SUPPORT" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote
   mkdir -p $INSTALL/lib/udev
     cp $PKG_DIR/scripts/wiiremote_helper $INSTALL/lib/udev
-  mkdir -p $INSTALL/lib/udev/rules.d
-    cp $PKG_DIR/rules.d/98-wiiremote.rules $INSTALL/lib/udev/rules.d
 fi
 
 if [ "$PS3REMOTE_SUPPORT" = yes ]; then
@@ -83,6 +84,4 @@ if [ "$PS3REMOTE_SUPPORT" = yes ]; then
    echo 'ICON_PATH="/usr/share/pixmaps/xbmc/"' > $PYTHON_LIBDIR/site-packages/xbmc/defs.py
   mkdir -p $INSTALL/lib/udev
     cp $PKG_DIR/scripts/ps3remote_helper $INSTALL/lib/udev
-  mkdir -p $INSTALL/lib/udev/rules.d
-    cp $PKG_DIR/rules.d/98-ps3remote.rules $INSTALL/lib/udev/rules.d
 fi
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb
new file mode 100755
index 0000000000..ee72bfee67
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+
+case "$1" in
+  thaw|resume)
+    (
+      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
+    ;;
+esac
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb
new file mode 100755
index 0000000000..7abc8c90da
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
+
+case "$1" in
+  thaw|resume)
+    (
+      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
+    ;;
+esac
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc b/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc
new file mode 100755
index 0000000000..6df3ad6b31
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/sleep.d/61xbmc_lirc
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    xbmc-send --host=127.0.0.1 -a "LIRC.Stop"
+    ;;
+  thaw|resume)
+    xbmc-send --host=127.0.0.1 -a "LIRC.Start"
+    ;;
+  *) exit $NA
+    ;;
+esac
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd b/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd
new file mode 100755
index 0000000000..7b93b3c3a3
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/sleep.d/62xbmc-lcd
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. /etc/profile
+
+case "$1" in
+  hibernate|suspend)
+    xbmc-send --host=127.0.0.1 -a "LCD.Suspend"
+    ;;
+  thaw|resume)
+    xbmc-send --host=127.0.0.1 -a "LCD.Resume"
+    ;;
+  *) exit $NA
+    ;;
+esac
diff --git a/packages/mediacenter/xbmc-pvr/rules.d/98-ps3remote.rules b/packages/mediacenter/xbmc-pvr/udev.d/98-ps3remote.rules
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/rules.d/98-ps3remote.rules
rename to packages/mediacenter/xbmc-pvr/udev.d/98-ps3remote.rules
diff --git a/packages/mediacenter/xbmc-pvr/rules.d/98-wiiremote.rules b/packages/mediacenter/xbmc-pvr/udev.d/98-wiiremote.rules
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/rules.d/98-wiiremote.rules
rename to packages/mediacenter/xbmc-pvr/udev.d/98-wiiremote.rules