diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 49f2f86437..af77e17d00 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -11,7 +11,8 @@ $SCRIPTS/build lzo
 $SCRIPTS/build pcre
 
 $SCRIPTS/build alsa-lib
-$SCRIPTS/build enca
+$SCRIPTS/build libass
+$SCRIPTS/build enca #libass?
 $SCRIPTS/build curl
 $SCRIPTS/build libmicrohttpd
 $SCRIPTS/build libssh
@@ -25,15 +26,14 @@ $SCRIPTS/build libXrandr
 
 $SCRIPTS/build Mesa
 $SCRIPTS/build glew
-$SCRIPTS/build fontconfig
+$SCRIPTS/build fontconfig #libass?
 $SCRIPTS/build fribidi
 
 $SCRIPTS/build jpeg
 $SCRIPTS/build libpng
 $SCRIPTS/build tiff
-$SCRIPTS/build freetype
+$SCRIPTS/build freetype #libass?
 $SCRIPTS/build jasper
-# $SCRIPTS/build libass
 
 $SCRIPTS/build libmad
 $SCRIPTS/build libsamplerate
@@ -97,30 +97,32 @@ cd -
             --disable-debug \
             --enable-optimizations \
             --enable-gl \
-            --disable-profiling \
-            --disable-joystick \
-            --enable-xrandr \
-            --disable-ccache \
-            --disable-pulse \
-            --enable-faac \
-            --disable-libdts \
-            --disable-liba52 \
-            --enable-dvdcss \
-            --enable-ffmpeg-libvorbis \
-            --disable-mid \
-            --disable-goom \
-            --disable-xbmcprojectm \
-            --disable-rsxs \
-            --enable-avahi \
-            --disable-hal \
-            --enable-webserver \
             $XBMC_VDPAU \
             $XBMC_VAAPI \
             $XBMC_CRYSTALHD \
+            --disable-vdadecoder \
+            --disable-profiling \
+            --disable-joystick \
+            --enable-xrandr \
+            --disable-goom \
+            --disable-xbmcprojectm \
+            --disable-rsxs \
+            --disable-ccache \
+            --disable-pulse \
+            --enable-ffmpeg-libvorbis \
+            --enable-faac \
+            --enable-dvdcss \
+            --disable-mid \
+            --disable-hal \
+            --enable-avahi \
+            --enable-non-free \
+            --disable-asap-codec \
+            --enable-webserver \
+            --disable-libdts \
+            --disable-liba52 \
             --disable-external-ffmpeg \
             --disable-external-liba52 \
             --disable-external-libdts \
-            --disable-external-libass \
             --enable-external-libz \
             --enable-external-python \
 
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index a40d9d4efe..ad4ac01714 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -9,7 +9,8 @@ $SCRIPTS/install lzo
 $SCRIPTS/install pcre
 
 $SCRIPTS/install alsa-lib
-$SCRIPTS/install enca
+$SCRIPTS/install libass
+$SCRIPTS/install enca #libass
 $SCRIPTS/install curl
 $SCRIPTS/install libmicrohttpd
 $SCRIPTS/install libssh
@@ -29,13 +30,13 @@ $SCRIPTS/install Mesa
 [ "$VAAPI" = yes ] && $SCRIPTS/install libva
 [ "$CRYSTALHD" = yes ] && $SCRIPTS/install crystalhd
 $SCRIPTS/install glew
-$SCRIPTS/install fontconfig
+$SCRIPTS/install fontconfig  #libass?
 $SCRIPTS/install fribidi
 
 $SCRIPTS/install jpeg
 $SCRIPTS/install libpng
 $SCRIPTS/install tiff
-$SCRIPTS/install freetype
+$SCRIPTS/install freetype   #libass?
 $SCRIPTS/install jasper
 # $SCRIPTS/install libass