diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 00673e71bc..4eb5141083 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -66,6 +66,13 @@ else
   XBMC_VDPAU="--disable-vdpau"
 fi
 
+if [ "$VAAPI" = yes ]; then
+  $SCRIPTS/build libva
+  XBMC_VAAPI="--enable-vaapi"
+else
+  XBMC_VAAPI="--disable-vaapi"
+fi
+
 if [ "$CRYSTALHD" = yes ]; then
   $SCRIPTS/build crystalhd
   XBMC_CRYSTALHD="--enable-crystalhd"
@@ -73,13 +80,6 @@ else
   XBMC_CRYSTALHD="--disable-crystalhd"
 fi
 
-if [ "$FFMPEG" = external ]; then
-  $SCRIPTS/build ffmpeg
-  XBMC_FFMPEG="--enable-external-ffmpeg"
-else
-  XBMC_FFMPEG="--disable-external-ffmpeg"
-fi
-
 LDFLAGS="$LDFLAGS -lpython2.6"
 
 cd $PKG_BUILD
@@ -117,8 +117,9 @@ cd -
             --enable-hal \
             --enable-webserver \
             $XBMC_VDPAU \
+            $XBMC_VAAPI \
             $XBMC_CRYSTALHD \
-            $XBMC_FFMPEG \
+            --disable-internal-ffmpeg \
             --disable-external-liba52 \
             --disable-external-libdts \
             --disable-external-libass \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index e9be26fc89..532da929e0 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -26,6 +26,7 @@ $SCRIPTS/install libXrandr
 
 $SCRIPTS/install Mesa
 [ "$VDPAU" = yes ] && $SCRIPTS/install libvdpau
+[ "$VAAPI" = yes ] && $SCRIPTS/install libva
 [ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd
 $SCRIPTS/install glew
 $SCRIPTS/install fontconfig
@@ -52,7 +53,6 @@ $SCRIPTS/install flac
 $SCRIPTS/install wavpack
 $SCRIPTS/install libmpeg2
 # $SCRIPTS/install musepack
-[ "$FFMPEG" = external ] && $SCRIPTS/install ffmpeg
 
 $SCRIPTS/install SDL
 $SCRIPTS/install SDL_mixer