diff -ur faad2.orig/configure.in faad2/configure.in
--- faad2.orig/configure.in	2006-08-13 16:13:31.000000000 +0200
+++ faad2/configure.in	2006-08-14 12:03:07.000000000 +0200
@@ -29,9 +29,6 @@
 AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
 	     WITHXMMS=$withval, WITHXMMS=no)
 
-AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],
-	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])
-
 AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],
 	     WITHDRM=$withval, WITHDRM=no)
 
@@ -114,12 +111,6 @@
  AM_CONDITIONAL(HAVE_XMMS, false)
 fi
 
-if test x$WITHBMP = xyes; then
-  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
-  AM_CONDITIONAL([HAVE_XMMS], true)
-  AM_CONDITIONAL([HAVE_BMP], true)
-fi
-
 if test x$WITHDRM = xyes; then
   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
   AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])
diff -ur faad2.orig/plugins/Makefile.am faad2/plugins/Makefile.am
--- faad2.orig/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
+++ faad2/plugins/Makefile.am	2006-08-14 11:35:44.000000000 +0200
@@ -1,17 +1,13 @@
-if HAVE_MPEG4IP_PLUG
-if HAVE_XMMS
-SUBDIRS = xmms mpeg4ip
-else
-SUBDIRS = mpeg4ip
-endif #HAVE_XMMS
-else
-if HAVE_XMMS
-SUBDIRS = xmms
-else
-if HAVE_BMP
-SUBDIRS = bmp
-else
-SUBDIRS =
-endif #HAVE_BMP
-endif #HAVE_XMMS
-endif #HAVE_MPEG4IP_PLUG
+if HAVE_MPEG4IP_PLUG
+if HAVE_XMMS
+SUBDIRS = xmms mpeg4ip
+else
+SUBDIRS = mpeg4ip
+endif #HAVE_XMMS
+else
+if HAVE_XMMS
+SUBDIRS = xmms
+else
+SUBDIRS =
+endif #HAVE_XMMS
+endif #HAVE_MPEG4IP_PLUG
diff -ur faad2.orig/plugins/xmms/src/Makefile.am faad2/plugins/xmms/src/Makefile.am
--- faad2.orig/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
+++ faad2/plugins/xmms/src/Makefile.am	2006-08-14 12:06:15.000000000 +0200
@@ -1,12 +1,6 @@
-if HAVE_BMP
-libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
-local_CFLAGS=$(shell pkg-config --cflags bmp)
-local_LDFLAGS=$(shell pkg-config --libs bmp)
-else
 local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
 local_LDFLAGS=`$(XMMS_CONFIG) --libs`
 libdir = `$(XMMS_CONFIG) --input-plugin-dir`
-endif #HAVE_BMP
 lib_LTLIBRARIES = libmp4.la
 
 libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \