diff --git a/config/options b/config/options
index 3e3fb8b500..399341f007 100644
--- a/config/options
+++ b/config/options
@@ -81,17 +81,14 @@ get_graphicdrivers() {
 
     if [ $drv = i915 -o $drv = i965 ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
-      DRM_DRIVERS="$DRM_DRIVERS intel"
     fi
 
     if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o $drv = radeon ]; then
       XORG_DRIVERS="$XORG_DRIVERS ati"
-      DRM_DRIVERS="$DRM_DRIVERS radeon"
     fi
 
     if [ $drv = nouveau ]; then
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      DRM_DRIVERS="$DRM_DRIVERS nouveau"
     fi
 
     if [ $drv = nvidia ]; then
@@ -100,7 +97,6 @@ get_graphicdrivers() {
     fi
 
     if [ $drv = vmware ]; then
-      DRM_DRIVERS="$DRM_DRIVERS vmware"
       XINERAMA_SUPPORT="yes"
     fi
   done
diff --git a/packages/graphics/libdrm/build b/packages/graphics/libdrm/build
index bbb2a2e809..4751549977 100755
--- a/packages/graphics/libdrm/build
+++ b/packages/graphics/libdrm/build
@@ -9,14 +9,14 @@ $SCRIPTS/build udev
 get_graphicdrivers
 
 DRM_CONFIG="--disable-libkms --disable-intel --disable-radeon"
-DRM_CONFIG="$DRM_CONFIG --disable-nouveau-experimental-api --enable-vmwgfx-experimental-api"
+DRM_CONFIG="$DRM_CONFIG --disable-nouveau-experimental-api --disable-vmwgfx-experimental-api"
 
-for drv in $DRM_DRIVERS; do
-  [ $drv = intel ] && \
+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 = radeon ] && \
+  [ $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/'`
 
diff --git a/packages/graphics/libdrm/install b/packages/graphics/libdrm/install
index 10927ec1bc..078dd735b4 100755
--- a/packages/graphics/libdrm/install
+++ b/packages/graphics/libdrm/install
@@ -8,8 +8,5 @@ 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
 
-for drv in $DRM_DRIVERS; do
-  [ -f $PKG_BUILD/$drv/.libs/libdrm_$drv*.so* ] && \
-  cp -P $PKG_BUILD/$drv/.libs/libdrm_$drv*.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libdrm_$drv*.so*T
-done
+  cp -P $PKG_BUILD/*/.libs/libdrm_*.so $INSTALL/usr/lib || true
+  cp -P $PKG_BUILD/*/.libs/libdrm_*.so*[0-9] $INSTALL/usr/lib || true