diff --git a/config/functions b/config/functions
index 17ee997244..16c7feedf8 100644
--- a/config/functions
+++ b/config/functions
@@ -278,7 +278,7 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
-  config_message="$config_message\n - OpenMAX Support (provider):\t\t $OPENMAX_SUPPORT ($OPENMAX)"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
   config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
diff --git a/config/graphic b/config/graphic
index e931a7165a..4810db997f 100644
--- a/config/graphic
+++ b/config/graphic
@@ -20,12 +20,6 @@ if [ "$SDL_SUPPORT" = no ]; then
   JOYSTICK_SUPPORT="no"
 fi
 
-if [ "$OPENMAX" = no ]; then
-  OPENMAX_SUPPORT="no"
-else
-  OPENMAX_SUPPORT="yes"
-fi
-
 if [ "$OPENGL_SUPPORT" = no ]; then
   XBMC_SCR_RSXS="no"
   XBMC_VIS_PROJECTM="no"
diff --git a/packages/devel/libcec/build b/packages/devel/libcec/build
index d842bf6e55..2a92018b94 100755
--- a/packages/devel/libcec/build
+++ b/packages/devel/libcec/build
@@ -22,7 +22,7 @@
 
 . config/options $1
 
-if [ "$OPENMAX" = "bcm2835-driver" ]; then
+if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
   BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
                     -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
   CFLAGS="$CFLAGS $BCM2835_INCLUDES"
@@ -32,13 +32,12 @@ else
   LIBCEC_RPI="--disable-rpi"
 fi
 
-if [ "$OPENGLES" = "marvell-libgfx" ]; then
+if [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then
   LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi"
 else
   LIBCEC_TDA995X="--disable-cubox"
 fi
 
-
 # dont use some optimizations because of build problems
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 
diff --git a/packages/devel/libcec/meta b/packages/devel/libcec/meta
index e23dcbe36c..3175941b43 100644
--- a/packages/devel/libcec/meta
+++ b/packages/devel/libcec/meta
@@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
-if [ "$OPENMAX" = "bcm2835-driver" ]; then
+if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS="$PKG_DEPENDS bcm2835-driver"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bcm2835-driver"
 fi
diff --git a/packages/initramfs/devel/eglibc-initramfs/meta b/packages/initramfs/devel/eglibc-initramfs/meta
index b112a99206..9d344c8b10 100644
--- a/packages/initramfs/devel/eglibc-initramfs/meta
+++ b/packages/initramfs/devel/eglibc-initramfs/meta
@@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$OPENMAX" = "bcm2835-driver" ]; then
+if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS="$PKG_DEPENDS libcofi-initramfs"
 fi
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index b815e2293b..e1d005e89e 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -36,9 +36,6 @@ fi
 
 if [ "$OPENGLES_SUPPORT" = yes ]; then
   XBMC_OPENGLES="--enable-gles"
-  if [ "$OPENGLES" = "marvell-libgfx" ]; then
-    XBMC_PLATFORM_SUPPORT="--with-platform=marvell-dove"
-  fi
 else
   XBMC_OPENGLES="--disable-gles"
 fi
@@ -191,16 +188,18 @@ else
   XBMC_WEBSERVER="--disable-webserver"
 fi
 
-if [ "$OPENMAX_SUPPORT" = yes ]; then
+if [ "$XBMCPLAYER_DRIVER" = bcm2835-driver ]; then
   XBMC_OPENMAX="--enable-openmax"
-  if [ "$OPENMAX" = "bcm2835-driver" ]; then
-    XBMC_PLATFORM_SUPPORT="--with-platform=raspberry-pi"
-    XBMC_PLAYER="--enable-player=omxplayer"
-    BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
-                      -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
-    CFLAGS="$CFLAGS $BCM2835_INCLUDES"
-    CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
-  fi
+  XBMC_PLAYER="--enable-player=omxplayer"
+  XBMC_CODEC="--with-platform=raspberry-pi"
+  BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
+                    -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
+  CFLAGS="$CFLAGS $BCM2835_INCLUDES"
+  CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
+elif [ "$XBMCPLAYER_DRIVER" = "marvell-libgfx" ]; then
+  XBMC_OPENMAX="--disable-openmax"
+  XBMC_PLAYER="--with-platform=marvell-dove"
+  XBMC_CODEC=""
 else
   XBMC_OPENMAX="--disable-openmax"
 fi
@@ -311,7 +310,7 @@ export gl_cv_func_gettimeofday_clobber=no
             --enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \
             --disable-external-libraries \
             --enable-external-ffmpeg \
-            $XBMC_PLATFORM_SUPPORT \
+            $XBMC_CODEC \
             $XBMC_PLAYER \
 
 # setup default skin inside the sources
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 98e8faf7dc..7463f48dd8 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -172,9 +172,9 @@ if [ "$WEBSERVER" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libmicrohttpd"
 fi
 
-if [ "$OPENMAX_SUPPORT" = yes ]; then
-  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $OPENMAX"
-  PKG_DEPENDS="$PKG_DEPENDS $OPENMAX"
+if [ ! "$XBMCPLAYER_DRIVER" = default ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS $XBMCPLAYER_DRIVER"
+  PKG_DEPENDS="$PKG_DEPENDS $XBMCPLAYER_DRIVER"
 fi
 
 if [ "$VDPAU" = yes ]; then
diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta
index f3c72dd6df..f0e6226f1d 100644
--- a/packages/toolchain/devel/eglibc/meta
+++ b/packages/toolchain/devel/eglibc/meta
@@ -35,6 +35,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$OPENMAX" = "bcm2835-driver" ]; then
+if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS="$PKG_DEPENDS libcofi"
 fi
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index 16d4e46e90..63e38e7392 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="fglrx-legacy"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/ATV/options b/projects/ATV/options
index 32d0a3ee6d..7c8b80780b 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -260,8 +260,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nvidia-legacy"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/Fusion/options b/projects/Fusion/options
index a199f4c431..feb29fda04 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
   GRAPHIC_DRIVERS="fglrx"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/Generic/options b/projects/Generic/options
index 47a72e16a3..fac058a83c 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
   GRAPHIC_DRIVERS="fglrx fglrx-legacy i915 i965 nvidia"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="yes"
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 96602a8f18..2af62d997f 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
   GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/ION/options b/projects/ION/options
index 1bf1b1cbdf..335e1edfbf 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nvidia"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index 2a5f2594fb..19cc2c7938 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="i915 i965"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/RPi/options b/projects/RPi/options
index 14e015b777..0632595494 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS=""
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="bcm2835-driver"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="bcm2835-driver"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 674fea0199..1b831a410d 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -259,8 +259,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nvidia"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="yes"
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 1ba287436e..2568b0640a 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -254,8 +254,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="vmware virtualbox"
 
-# OpenMAX implementation to use (no / bcm2835-driver)
-  OPENMAX="no"
+# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
+  XBMCPLAYER_DRIVER="default"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"