diff --git a/config/graphic b/config/graphic
index 68fd946991..e05906d217 100644
--- a/config/graphic
+++ b/config/graphic
@@ -51,9 +51,13 @@ get_graphicdrivers() {
     fi
 
     if [ "$drv" = "nouveau" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
+      DRI_DRIVERS="$DRI_DRIVERS"
+      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
+      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      COMPOSITE_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi