diff -p -up xbmc-10.0/configure.in.orig xbmc-10.0/configure.in
--- xbmc-10.0/configure.in.orig	2010-12-18 20:48:34.248708117 +0200
+++ xbmc-10.0/configure.in	2010-12-18 20:48:34.520751808 +0200
@@ -640,7 +640,6 @@ else
   # paths from mysql_config
   AC_CHECK_LIB([modplug],    [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library))
-  AC_CHECK_LIB([faad],       [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([smbclient],  [main],, AC_MSG_ERROR($missing_library))
   AC_CHECK_LIB([SDL_mixer],  [main],, AC_MSG_ERROR($missing_library))
@@ -693,7 +692,6 @@ if test "$host_vendor" != "apple"; then
   XB_FIND_SONAME([CURL],        [curl])
   XB_FIND_SONAME([FLAC],        [FLAC])
   XB_FIND_SONAME([MODPLUG],     [modplug])
-  XB_FIND_SONAME([FAAD],        [faad])
   XB_FIND_SONAME([MAD],         [mad])
 fi
 XB_FIND_SONAME([OGG],         [ogg])
diff -p -up xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h
--- xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h.orig	2010-12-17 08:17:41.000000000 +0200
+++ xbmc-10.0/xbmc/cores/dvdplayer/DVDCodecs/Audio/DllLibFaad.h	2010-12-18 20:48:34.520751808 +0200
@@ -24,7 +24,7 @@
 #if (defined HAVE_CONFIG_H) && (!defined WIN32)
   #include "config.h"
 #endif
-#if defined(_LINUX) && !defined(__APPLE__)
+#if 0
   #include <neaacdec.h>
 #else
   #include "libfaad/neaacdec.h"
diff -p -up xbmc-10.0/xbmc/DllPaths_generated.h.in.orig xbmc-10.0/xbmc/DllPaths_generated.h.in
--- xbmc-10.0/xbmc/DllPaths_generated.h.in.orig	2010-12-17 08:17:41.000000000 +0200
+++ xbmc-10.0/xbmc/DllPaths_generated.h.in	2010-12-18 20:48:34.520751808 +0200
@@ -82,7 +82,7 @@
 #define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/dvdplayer/libmpeg2-@ARCH@.so"
 #define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so"
 #if defined(_LINUX) && !defined(__APPLE__)
-#define DLL_PATH_LIBFAAD       "@FAAD_SONAME@"
+#define DLL_PATH_LIBFAAD       "libfaad.so.2"
 #define DLL_PATH_LIBMAD        "@MAD_SONAME@"
 #else
 #define DLL_PATH_LIBFAAD       "special://xbmcbin/system/players/dvdplayer/libfaad-@ARCH@.so"