diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index 6c08bbbf80..f6fbfd72c3 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -134,11 +134,7 @@
   # Display fatal error message
   # $1:action which caused error, $2:message
     echo "*** Error in $BOOT_STEP: $1: $2 ***"
-    if [ -z "$DEBUG" ]; then
-      halt
-    else
-      debug_shell
-    fi
+    debug_shell
   }
 
   break_after() {
diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta
index 3d0fb8a4c7..53985e81ce 100644
--- a/packages/multimedia/ffmpeg/meta
+++ b/packages/multimedia/ffmpeg/meta
@@ -47,3 +47,16 @@ if [ "$VDPAU" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
   PKG_DEPENDS="$PKG_DEPENDS libvdpau"
 fi
+
+if [ "$XVBA" = yes ]; then
+  get_graphicdrivers
+  for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "fglrx" ]; then
+      PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx"
+      PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx"
+    elif [ "$drv" = "fglrx-legacy" ]; then
+      PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx-legacy"
+      PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy"
+    fi
+  done
+fi
diff --git a/packages/multimedia/libXVBA/package.mk b/packages/multimedia/libXVBA/package.mk
new file mode 100644
index 0000000000..793aaf4833
--- /dev/null
+++ b/packages/multimedia/libXVBA/package.mk
@@ -0,0 +1,75 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libXVBA"
+PKG_VERSION="13.8"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://amd.com"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="libX11"
+PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libXVBA: a Video Decode library for AMD"
+PKG_LONGDESC="libXVBA is a Video Decode library for AMD."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+if [ "$TARGET_ARCH" = i386 ]; then
+  LIBXVBA_FGLRX_ARCH=x86
+  LIBXVBA_LIBDIR=lib
+elif [ "$TARGET_ARCH" = x86_64 ]; then
+  LIBXVBA_FGLRX_ARCH=x86_64
+  LIBXVBA_LIBDIR=lib64
+fi
+
+LIBXVBA_INSTALL_DIR="/usr/lib/fglrx/"
+
+make_target() {
+  : # nothing to make
+}
+
+makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/include/amd
+    cp include/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
+
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
+      ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
+      ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
+}
+
+post_makeinstall_target() {
+  mkdir -p $INSTALL/$LIBXVBA_INSTALL_DIR/lib
+    cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.cap $INSTALL/$LIBXVBA_INSTALL_DIR/lib
+    cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libAMDXvBA.so.1
+    cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libXvBAW.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libXvBAW.so.1
+
+  (
+    cd $INSTALL/$LIBXVBA_INSTALL_DIR/
+    for lib in `find lib -type f`; do
+      mkdir -p $INSTALL/usr/`dirname $lib`
+        ln -sf /var/run/fglrx/$lib $INSTALL/usr/$lib
+    done
+  )
+}
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index b7f901b4d1..df3d430326 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.7"
+PKG_VERSION="5.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk
index ed464603c8..8a9353a7a2 100644
--- a/packages/sysutils/dbus/package.mk
+++ b/packages/sysutils/dbus/package.mk
@@ -39,8 +39,8 @@ PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
                            --libexecdir=/usr/lib/dbus \
-                           --enable-verbose-mode \
-                           --enable-asserts \
+                           --disable-verbose-mode \
+                           --disable-asserts \
                            --enable-checks \
                            --disable-tests \
                            --disable-ansi \
@@ -57,9 +57,9 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
                            --without-x \
                            --with-dbus-user=dbus"
 
-PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \
-                         --enable-asserts \
-                         --enable-checks \
+PKG_CONFIGURE_OPTS_HOST="--disable-verbose-mode \
+                         --disable-asserts \
+                         --disable-checks \
                          --disable-tests \
                          --disable-xml-docs \
                          --disable-doxygen-docs"
diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build
index 2581cf0abf..27cee58478 100755
--- a/packages/x11/driver/xf86-video-fglrx/build
+++ b/packages/x11/driver/xf86-video-fglrx/build
@@ -101,20 +101,21 @@ cd $ROOT/$PKG_BUILD
   mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
     cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux
 
-if [ "$XVBA" = yes ]; then
-  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
-  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
-  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
+# disabled until we can expect non broken drivers from AMD:
+# if [ "$XVBA" = yes ]; then
+#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
+#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
+#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
 
-# install needed files for toolchain
-  mkdir -p $SYSROOT_PREFIX/usr/include/amd
-    cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
+# # install needed files for toolchain
+#   mkdir -p $SYSROOT_PREFIX/usr/include/amd
+#     cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
 
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
-    ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
-    ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
-fi
+#   mkdir -p $SYSROOT_PREFIX/usr/lib
+#     cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
+#     ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
+#     ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
+# fi
 
 (
   cd $INSTALL_DIR/
diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta
index fe414e2ebd..844abf5999 100644
--- a/packages/x11/driver/xf86-video-fglrx/meta
+++ b/packages/x11/driver/xf86-video-fglrx/meta
@@ -35,3 +35,9 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+if [ "$XVBA" = yes ]; then
+# hack around broken AMD drivers
+  PKG_DEPENDS="libXVBA"
+  PKG_BUILD_DEPENDS="toolchain libXVBA"
+fi
diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf
index aefb619b87..8e9ed36fa5 100644
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf
index bea34e6e92..bbbd0a1df8 100644
--- a/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf
+++ b/projects/ATV/filesystem/etc/X11/xorg-nvidia.conf
@@ -8,8 +8,6 @@ Section "Device"
     Option         "ModeValidation" "NoVesaModes, NoXServerModes"
     Option         "HWCursor" "false"
     Option         "RegistryDwords" "RMDisableRenderToSysmem=1"
-    # To put Xorg in debug mode change "false" to "true" in the line below:
-    Option         "ModeDebug" "false"
     # To use a local /storage/.config/edid.bin file uncomment the 4 lines below:
 #    Option         "ConnectedMonitor" "DFP-0"
 #    Option         "CustomEDID" "DFP-0:/storage/.config/edid.bin"
@@ -17,6 +15,9 @@ Section "Device"
 #    Option         "UseEDID" "true"
 EndSection
 
+# To put Xorg in debug mode "touch /storage/.config/debug.xorg" .. if you set
+# "ModeDebug" "true" in xorg.conf IT WILL NOT WORK!
+
 Section "Screen"
     Identifier     "screen"
     Device         "nvidia"
@@ -26,7 +27,7 @@ Section "Screen"
     Option         "TVStandard" "HD1080i"
     # If Component video does not fill the screen uncomment the line below:
 #    Option         "TVOverscan" "0.8"   # use values from 0.0 (min) to 1.0 (max)
-    Option         "MetaModes" "DFP: 1920x1080; DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
+    Option         "MetaModes" "DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
     SubSection     "Display"
         Depth       24
     EndSubSection
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index ffa1f1fb76..3ab479c57f 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1890,7 +1890,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index c5aaa97ac0..d9355f4680 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1866,7 +1866,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 0ff4a65d1f..9f2c832a0f 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -1888,7 +1888,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/ION/linux/linux.i386.conf.deprecated b/projects/ION/linux/linux.i386.conf.deprecated
index 54f9fc6bb6..bdc7ff5842 100644
--- a/projects/ION/linux/linux.i386.conf.deprecated
+++ b/projects/ION/linux/linux.i386.conf.deprecated
@@ -1818,7 +1818,7 @@ CONFIG_HWMON_VID=y
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 584918cde4..e1742bb7d2 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1762,7 +1762,7 @@ CONFIG_HWMON_VID=y
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/Intel/linux/linux.i386.conf.deprecated b/projects/Intel/linux/linux.i386.conf.deprecated
index 5b3e833770..db6a3b8271 100644
--- a/projects/Intel/linux/linux.i386.conf.deprecated
+++ b/projects/Intel/linux/linux.i386.conf.deprecated
@@ -1836,7 +1836,7 @@ CONFIG_HWMON_VID=y
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 136502db9e..459112421a 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1793,7 +1793,7 @@ CONFIG_HWMON_VID=y
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index c0bb5a2fa5..f54baf2670 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1072,7 +1072,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_POWERMATE is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index 66a6c09bd4..9956f1253e 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -1889,7 +1889,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index aefb619b87..8e9ed36fa5 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_CORETEMP=y
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set