diff --git a/projects/intel/options b/projects/intel/options
index f602e606e..3fd869143 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -1,18 +1,35 @@
-# Mediacenter to use (moovida, mythtv)
-MEDIACENTER=mythtv
+# Mediacenter to use (moovida / mythtv)
+  MEDIACENTER=moovida
 
-GAMES=yes
-EMULATORS=yes
+# Displayserver to use (wayland / Xorg)
+  DISPLAYSERVER=wayland
 
-# X.org drivers to use (all/ati/geode/glint/i740/intel/mga/nv/openchrome/
-# radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
-# Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
-XORG_DRIVERS="intel"
+# X.org drivers to use (all / ati,intel)
+# Space separated list is supported, e.g. XORG_DRIVERS="ati intel"
+  XORG_DRIVERS="intel"
 
-# eg.: i915, i965
-DRIDRIVERS="i965"
+# DRI drivers to use (i915, i965, radeon)
+# Comma separated list is supported, e.g. DRIDRIVERS="i915,i965,radeon,swrast"
+  DRIDRIVERS="radeon,i965"
 
-MESA=Mesa-master
-LIBDRM=libdrm
-CAIRO=cairo-master
-DISPLAY=eagle
\ No newline at end of file
+# MESA to use (Mesa / Mesa-master)
+  MESA=Mesa-master
+
+# libdrm to use (libdrm / libdrm-master)
+  LIBDRM=libdrm
+
+# build with games support (yes / no)
+  GAMES=yes
+
+# build with emulator support (yes / no)
+  EMULATORS=yes
+
+#####################################################################
+## Do not change anything below this line
+#####################################################################
+
+if [ "$DISPLAYSERVER" = Xorg ]; then
+  CAIRO=cairo
+elif [ "$DISPLAYSERVER" = wayland ]; then
+  CAIRO=cairo-drm
+fi