diff --git a/packages/graphics/Mesa-GL/build b/packages/graphics/Mesa-GL/build
index 9a66b4e197..c6c47a900c 100755
--- a/packages/graphics/Mesa-GL/build
+++ b/packages/graphics/Mesa-GL/build
@@ -8,7 +8,7 @@ $SCRIPTS/build talloc
 $SCRIPTS/build expat
 $SCRIPTS/build glproto
 $SCRIPTS/build dri2proto
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build libXext
 $SCRIPTS/build libXdamage
 $SCRIPTS/build libXfixes
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index a8be0a76fc..a0c17abe82 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -7,7 +7,7 @@ $SCRIPTS/build talloc
 $SCRIPTS/build expat
 $SCRIPTS/build glproto
 $SCRIPTS/build dri2proto
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build libXext
 $SCRIPTS/build libXdamage
 $SCRIPTS/build libXfixes
diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install
index 8ee9847a75..781d48a53c 100755
--- a/packages/graphics/Mesa/install
+++ b/packages/graphics/Mesa/install
@@ -3,7 +3,7 @@
 . config/options $1
 
 $SCRIPTS/install libXdamage
-$SCRIPTS/install $LIBDRM
+$SCRIPTS/install libdrm
 $SCRIPTS/install talloc
 $SCRIPTS/install expat
 $SCRIPTS/install libXext
diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build
index 2435ddf1db..f00a5da18d 100755
--- a/packages/graphics/cairo/build
+++ b/packages/graphics/cairo/build
@@ -11,7 +11,7 @@ $SCRIPTS/build pixman
 $SCRIPTS/build libXrender
 $SCRIPTS/build libX11
 # $SCRIPTS/build $MESA
-# $SCRIPTS/build $LIBDRM
+# $SCRIPTS/build libdrm
 # $SCRIPTS/build libxcb
 
 cd $PKG_BUILD
diff --git a/packages/graphics/libdrm-master/build b/packages/graphics/libdrm-master/build
deleted file mode 100755
index 4751549977..0000000000
--- a/packages/graphics/libdrm-master/build
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$SCRIPTS/build toolchain
-$SCRIPTS/build libpthread-stubs
-$SCRIPTS/build udev
-
-get_graphicdrivers
-
-DRM_CONFIG="--disable-libkms --disable-intel --disable-radeon"
-DRM_CONFIG="$DRM_CONFIG --disable-nouveau-experimental-api --disable-vmwgfx-experimental-api"
-
-for drv in $GRAPHIC_DRIVERS; do
-  [ $drv = i915 -o $drv = i965 ] && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-intel/enable-intel/'`
-
-  [ $drv = r200 -o $drv = r300 -o $drv = r600 -o $drv = radeon ] && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-radeon/enable-radeon/'`
-
-  [ $drv = nouveau ] && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-nouveau/enable-nouveau/'`
-
-  [ $drv = vmware ] && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-libkms/enable-libkms/'` && \
-    DRM_CONFIG=`echo $DRM_CONFIG | sed -e 's/disable-vmwgfx-experimental-api/enable-vmwgfx-experimental-api/'`
-done
-
-export LIBUDEV_CFLAGS="-I`ls -d $ROOT/$BUILD/udev*`"
-export LIBUDEV_LIBS="-I`ls -d $ROOT/$BUILD/udev*`"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-            --enable-udev \
-            --enable-largefile \
-            --with-kernel-source=$(kernel_path) \
-            $DRM_CONFIG \
-
-make
-
-$MAKEINSTALL
diff --git a/packages/graphics/libdrm-master/install b/packages/graphics/libdrm-master/install
deleted file mode 100755
index 078dd735b4..0000000000
--- a/packages/graphics/libdrm-master/install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-get_graphicdrivers
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libdrm.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL/usr/lib || true
-
-  cp -P $PKG_BUILD/*/.libs/libdrm_*.so $INSTALL/usr/lib || true
-  cp -P $PKG_BUILD/*/.libs/libdrm_*.so*[0-9] $INSTALL/usr/lib || true
diff --git a/packages/graphics/libdrm-master/url b/packages/graphics/libdrm-master/url
deleted file mode 100644
index 4c0b407e97..0000000000
--- a/packages/graphics/libdrm-master/url
+++ /dev/null
@@ -1 +0,0 @@
-http://sources.openelec.tv/svn/libdrm-master-20101104.tar.bz2
\ No newline at end of file
diff --git a/packages/graphics/libdrm/build b/packages/graphics/libdrm/build
index 4751549977..fd295d2bdd 100755
--- a/packages/graphics/libdrm/build
+++ b/packages/graphics/libdrm/build
@@ -2,10 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-$SCRIPTS/build libpthread-stubs
-$SCRIPTS/build udev
-
 get_graphicdrivers
 
 DRM_CONFIG="--disable-libkms --disable-intel --disable-radeon"
diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta
new file mode 100644
index 0000000000..7ff155e2cb
--- /dev/null
+++ b/packages/graphics/libdrm/meta
@@ -0,0 +1,19 @@
+PKG_NAME="libdrm"
+PKG_VERSION="2.4.22"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://dri.freedesktop.org"
+PKG_URL="http://dri.freedesktop.org/libdrm/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="udev"
+PKG_BUILD_DEPENDS="toolchain libpthread-stubs udev"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libdrm: Userspace interface to kernel DRM services"
+PKG_LONGDESC="The userspace interface library to kernel DRM services."
+PKG_IS_ADDON="no"
+
+if [ $LIBDRM_MASTER = "yes" ]; then
+  PKG_VERSION="20101111"
+  PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
+fi
diff --git a/packages/graphics/libdrm/url b/packages/graphics/libdrm/url
deleted file mode 100644
index b75c89f329..0000000000
--- a/packages/graphics/libdrm/url
+++ /dev/null
@@ -1 +0,0 @@
-http://dri.freedesktop.org/libdrm/libdrm-2.4.22.tar.bz2
\ No newline at end of file
diff --git a/packages/graphics/mesa-master-GL/build b/packages/graphics/mesa-master-GL/build
index 9a66b4e197..c6c47a900c 100755
--- a/packages/graphics/mesa-master-GL/build
+++ b/packages/graphics/mesa-master-GL/build
@@ -8,7 +8,7 @@ $SCRIPTS/build talloc
 $SCRIPTS/build expat
 $SCRIPTS/build glproto
 $SCRIPTS/build dri2proto
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build libXext
 $SCRIPTS/build libXdamage
 $SCRIPTS/build libXfixes
diff --git a/packages/graphics/mesa-master/build b/packages/graphics/mesa-master/build
index a8be0a76fc..a0c17abe82 100755
--- a/packages/graphics/mesa-master/build
+++ b/packages/graphics/mesa-master/build
@@ -7,7 +7,7 @@ $SCRIPTS/build talloc
 $SCRIPTS/build expat
 $SCRIPTS/build glproto
 $SCRIPTS/build dri2proto
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build libXext
 $SCRIPTS/build libXdamage
 $SCRIPTS/build libXfixes
diff --git a/packages/graphics/mesa-master/install b/packages/graphics/mesa-master/install
index 8ee9847a75..781d48a53c 100755
--- a/packages/graphics/mesa-master/install
+++ b/packages/graphics/mesa-master/install
@@ -3,7 +3,7 @@
 . config/options $1
 
 $SCRIPTS/install libXdamage
-$SCRIPTS/install $LIBDRM
+$SCRIPTS/install libdrm
 $SCRIPTS/install talloc
 $SCRIPTS/install expat
 $SCRIPTS/install libXext
diff --git a/packages/graphics/mesa-master/url b/packages/graphics/mesa-master/url
index 427bb26c94..6f1a9370f7 100644
--- a/packages/graphics/mesa-master/url
+++ b/packages/graphics/mesa-master/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/mesa-master-20101104.tar.bz2
\ No newline at end of file
+http://sources.openelec.tv/svn/mesa-master-20101111.tar.bz2
\ No newline at end of file
diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build
index f098a70429..6dc16a9039 100755
--- a/packages/multimedia/libva/build
+++ b/packages/multimedia/libva/build
@@ -6,7 +6,7 @@ $SCRIPTS/build toolchain
 $SCRIPTS/build libX11
 $SCRIPTS/build libXext
 $SCRIPTS/build libXfixes
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build $MESA
 
 cd $PKG_BUILD
diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install
index 625c93d110..e42dd8729d 100755
--- a/packages/multimedia/libva/install
+++ b/packages/multimedia/libva/install
@@ -5,7 +5,7 @@
 $SCRIPTS/install libX11
 $SCRIPTS/install libXext
 $SCRIPTS/install libXfixes
-$SCRIPTS/install $LIBDRM
+$SCRIPTS/install libdrm
 $SCRIPTS/install $MESA
 
 mkdir -p $INSTALL/usr/lib
diff --git a/packages/x11/driver/xf86-video-ati/meta b/packages/x11/driver/xf86-video-ati/meta
index 0552fdb318..b5d8af6883 100644
--- a/packages/x11/driver/xf86-video-ati/meta
+++ b/packages/x11/driver/xf86-video-ati/meta
@@ -5,8 +5,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXrandr libXrender libXext libpciaccess $LIBDRM udev"
-PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libXext libpciaccess $LIBDRM udev xorg-server"
+PKG_DEPENDS="libXrandr libXrender libXext libpciaccess libdrm udev"
+PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libXext libpciaccess libdrm udev xorg-server"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-ati: The Xorg driver for ATI video chips"
diff --git a/packages/x11/driver/xf86-video-nouveau/meta b/packages/x11/driver/xf86-video-nouveau/meta
index e1aef8d755..f5f6f0c699 100644
--- a/packages/x11/driver/xf86-video-nouveau/meta
+++ b/packages/x11/driver/xf86-video-nouveau/meta
@@ -5,8 +5,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXrandr libXrender $LIBDRM libXext libpciaccess udev $MESA"
-PKG_BUILD_DEPENDS="toolchain libXrandr libXrender $LIBDRM libXext libpciaccess udev $MESA xorg-server"
+PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev $MESA"
+PKG_BUILD_DEPENDS="toolchain libXrandr libXrender libdrm libXext libpciaccess udev $MESA xorg-server"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-nouveau: Nouveau display driver (experimental)"
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 9f615046b0..c578e56790 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -24,7 +24,7 @@ $SCRIPTS/build libpciaccess
 $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
-$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libdrm
 $SCRIPTS/build ${MESA}-GL
 $SCRIPTS/build openssl
 $SCRIPTS/build freetype
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 658fc6bd09..07a804cd20 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -9,7 +9,7 @@ $SCRIPTS/install freetype
 $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
-$SCRIPTS/install $LIBDRM
+$SCRIPTS/install libdrm
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
 $SCRIPTS/install udev
diff --git a/projects/ATV/options b/projects/ATV/options
index ed063c7784..d7904ccf8b 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -128,8 +128,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nouveau"
 
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM="libdrm-master"
+# use libdrm-master (latest git) instead latest released version
+  LIBDRM_MASTER="yes"
 
 # Mesa to use (Mesa / mesa-master)
   MESA="mesa-master"
diff --git a/projects/ION/options b/projects/ION/options
index 94e0b060b8..56b6476258 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -128,8 +128,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nvidia"
 
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM="libdrm"
+# use libdrm-master (latest git) instead latest released version
+  LIBDRM_MASTER="no"
 
 # Mesa to use (Mesa / mesa-master)
   MESA="Mesa"
diff --git a/projects/generic/options b/projects/generic/options
index 11160dd6ad..67f3786b36 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -128,8 +128,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
 
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM="libdrm"
+# use libdrm-master (latest git) instead latest released version
+  LIBDRM_MASTER="no"
 
 # Mesa to use (Mesa / mesa-master)
   MESA="Mesa"
diff --git a/projects/intel/options b/projects/intel/options
index 98f6412268..2313bc5856 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -128,8 +128,8 @@
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="i965"
 
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM="libdrm"
+# use libdrm-master (latest git) instead latest released version
+  LIBDRM_MASTER="no"
 
 # Mesa to use (Mesa / mesa-master)
   MESA="Mesa"