diff --git a/projects/generic/options b/projects/generic/options
index 19f9a53fda..bdc6a9fbaf 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -1,12 +1,101 @@
-# Mediacenter to use (moovida, entertainer)
-MEDIACENTER=moovida
+# Welcome Message for e.g. SSH Server (up to 5 Lines)
+  GREATING0="#######################################################"
+  GREATING1="# Welcome to OpenELEC - the powerfull Mediacenter4you #"
+  GREATING2="# .......... visit http://www.openelec.tv ........... #"
+  GREATING3="#######################################################"
+  GREATING4=""
 
-# 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="ati nouveau nv vesa openchrome intel"
+# Root password to integrate in the target system
+  ROOT_PASSWORD="openelec"
 
-MESA=Mesa
-LIBDRM=libdrm
-DRIDRIVERS="swrast,unichrome,r200,r300,radeon,i810,i915,i965"
+# Timezone to use (empty disables timezone support)
+# use a TZ environment string
+  TIMEZONE=
 
+# Mediacenter tu use (xbmc)
+  MEDIACENTER=xbmc
+
+# Skins to install (Vision2)
+  SKINS=Vision2
+
+# build with network support (yes / no)
+  NETWORK=yes
+
+# build and install Samba Server (yes / no)
+  SAMBA_SERVER=yes
+
+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER=xorg-server
+
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nouveau)
+# Space separated list is supported, 
+# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nouveau"
+  GRAPHIC_DRIVERS="all"
+
+# Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
+# leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
+# atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
+# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
+  REMOTE=mceusb
+
+# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
+# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
+# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
+  RECEIVER=mceusb
+
+# MESA to use (Mesa / Mesa-master)
+  MESA=Mesa-master
+
+# libdrm to use (libdrm / libdrm-master)
+  LIBDRM=libdrm
+
+# build with games support (yes / no)
+  GAMES=no
+
+# build with emulator support (yes / no)
+  EMULATORS=no
+
+# Coreboot support (yes / no)
+  COREBOOT=no
+
+#####################################################################
+## Do not change anything below this line
+#####################################################################
+
+if [ "$MEDIACENTER" = xbmc ]; then
+  MESA_GLU=yes
+fi
+
+get_graphicdrivers() {
+  if [ "$GRAPHIC_DRIVERS" = all ]; then
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nouveau"
+  fi
+
+  for drv in $GRAPHIC_DRIVERS; do
+    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
+    [ $drv = i965 ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
+    [ $drv = r200 ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
+    [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
+    [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
+    [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
+
+    if [ $drv = i915 -o $drv = i965 ]; then
+      MESA_CONFIG="$MESA_CONFIG --enable-gallium-intel"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+      DRM_DRIVERS="$DRM_DRIVERS intel"
+    fi
+
+    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o  $drv = radeon ]; then
+      MESA_CONFIG="$MESA_CONFIG --enable-gallium-radeon"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      DRM_DRIVERS="$DRM_DRIVERS radeon"
+    fi
+  
+    if [ $drv = nouveau ]; then
+      MESA_CONFIG="$MESA_CONFIG --enable-gallium-nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      DRM_DRIVERS="$DRM_DRIVERS nouveau"
+    fi
+
+  done
+}