diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 3f092983a5..0c2e3638ec 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -58,16 +58,17 @@ $SCRIPTS/build sqlite
 $SCRIPTS/build mysql #lib  #?
 $SCRIPTS/build samba #lib
 
-# export CMAKE_INSTALL_PREFIX=/usr
-# export CMAKE_FIND_ROOT_PATH=$SYSROOT_PREFIX
+XBMC_VDPAU="--disable-vdpau"
+
+if [ "$VDPAU" = yes ]; then
+  $SCRIPTS/build libvdpau
+  XBMC_VDPAU="--enable-vdpau"
+fi
 
 cd $PKG_BUILD
 autoheader
 autoconf
 
-# CC_FOR_BUILD=$HOST_CC \
-# CXX_FOR_BUILD=$HOST_CXX \
-# LDFLAGS="$LDFLAGS -lutil" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -77,7 +78,7 @@ autoconf
             --enable-debug \
             --enable-optimizations \
             --enable-gl \
-            --disable-vdpau \
+            $XBMC_VDPAU \
             --disable-profiling \
             --disable-joystick \
                --enable-xrandr \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 56c4ca3f26..8b81f96e79 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -24,6 +24,7 @@ $SCRIPTS/install libXinerama
 $SCRIPTS/install libXrandr
 
 $SCRIPTS/install $MESA
+[ "$VDPAU" = yes ] && $SCRIPTS/install libvdpau
 $SCRIPTS/install glew
 $SCRIPTS/install fontconfig
 $SCRIPTS/install fribidi
@@ -58,6 +59,7 @@ $SCRIPTS/install sqlite
 $SCRIPTS/install mysql
 $SCRIPTS/install samba
 
+
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 XBMC_TARGET_SYSTEM="linux"