diff --git a/projects/RPi/options b/projects/RPi/options
index e6a2421779..fbebc5f792 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -71,7 +71,7 @@
       # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
       # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
       # neon-vfpv4.
-      TARGET_FPU="neon"
+      TARGET_FPU="vfp"
       ;;
   esac
 
@@ -79,7 +79,7 @@
   OPTIMIZATIONS="speed"
 
 # Project CFLAGS
-  PROJECT_CFLAGS="-mfloat-abi=softfp -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated"
+  PROJECT_CFLAGS=""
 
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
@@ -133,13 +133,13 @@
   XBMC_PLUGINS=""
 
 # build and install 'RSXS' Screensaver (yes / no)
-  XBMC_SCR_RSXS="yes"
+  XBMC_SCR_RSXS="no"
 
 # build and install 'ProjectM' Visualization (yes / no)
-  XBMC_VIS_PROJECTM="yes"
+  XBMC_VIS_PROJECTM="no"
 
 # build and install 'GOOM' Visualization (yes / no)
-  XBMC_VIS_GOOM="yes"
+  XBMC_VIS_GOOM="no"
 
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="no"
@@ -199,7 +199,7 @@
   SFTP_SERVER="yes"
 
 # build and install SSH Guard (yes / no)
-  SSHGUARD_SUPPORT="yes"
+  SSHGUARD_SUPPORT="no"
 
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
@@ -276,7 +276,7 @@
 # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE=""
+  FIRMWARE="misc-firmware wlan-firmware"
   if [ "$PVR" = yes ]; then
     FIRMWARE="$FIRMWARE dvb-firmware"
   fi