diff --git a/config/options b/config/options
index d2ede1e2c3..6e9a1c49ce 100644
--- a/config/options
+++ b/config/options
@@ -77,6 +77,7 @@ get_graphicdrivers() {
     [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
     [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
+    [ $drv = nouveau ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
 
     if [ $drv = i915 -o $drv = i965 ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -88,11 +89,15 @@ get_graphicdrivers() {
       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
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       XINERAMA_SUPPORT="yes"
     fi
-
   done
 }