diff --git a/packages/graphics/libdrm-master/build b/packages/graphics/libdrm-master/build
index bbb2a2e809..4751549977 100755
--- a/packages/graphics/libdrm-master/build
+++ b/packages/graphics/libdrm-master/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-master/install b/packages/graphics/libdrm-master/install
index 10927ec1bc..078dd735b4 100755
--- a/packages/graphics/libdrm-master/install
+++ b/packages/graphics/libdrm-master/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