diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index ae397823b8..edec175b4f 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -226,6 +226,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install ALSA Audio support (yes / no)
+  ALSA_SUPPORT="yes"
+
 # additional packages to install:
 # Space separated list is supported,
 # e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"
diff --git a/projects/ARM/options b/projects/ARM/options
index 63c03f9627..cba5cd8cf3 100644
--- a/projects/ARM/options
+++ b/projects/ARM/options
@@ -135,9 +135,6 @@
   # cron support (yes / no)
     CRON_SUPPORT="no"
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="no"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
diff --git a/projects/Allwinner/options b/projects/Allwinner/options
index 50b9766499..754611042d 100644
--- a/projects/Allwinner/options
+++ b/projects/Allwinner/options
@@ -31,9 +31,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
diff --git a/projects/Amlogic/options b/projects/Amlogic/options
index 9bbc07058a..475f518447 100644
--- a/projects/Amlogic/options
+++ b/projects/Amlogic/options
@@ -40,9 +40,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 418f22b73d..80b0cb29ef 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -46,9 +46,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
diff --git a/projects/NXP/options b/projects/NXP/options
index 85b303489b..38758016fb 100644
--- a/projects/NXP/options
+++ b/projects/NXP/options
@@ -26,9 +26,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
diff --git a/projects/Qualcomm/devices/Dragonboard/options b/projects/Qualcomm/devices/Dragonboard/options
index 64af254add..f7dda9d0a8 100644
--- a/projects/Qualcomm/devices/Dragonboard/options
+++ b/projects/Qualcomm/devices/Dragonboard/options
@@ -54,9 +54,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / Mesa)
     OPENGL="no"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index f2a10dc4ed..61b00e101f 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -66,9 +66,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
@@ -110,7 +107,11 @@
   # for a list of additional drivers see packages/linux-drivers
   # Space separated list is supported,
   # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config bcm2835-driver"
+    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm2835-driver"
+
+    if [ "${ALSA_SUPPORT}" = "yes" ]; then
+      ADDITIONAL_DRIVERS+=" rpi-cirrus-config"
+    fi
 
   # build and install driver addons (yes / no)
     DRIVER_ADDONS_SUPPORT="no"
diff --git a/projects/Rockchip/options b/projects/Rockchip/options
index 92369011d7..ceb9a8783d 100644
--- a/projects/Rockchip/options
+++ b/projects/Rockchip/options
@@ -35,9 +35,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"
 
diff --git a/projects/Samsung/options b/projects/Samsung/options
index e2043278b2..73f1c0edc5 100644
--- a/projects/Samsung/options
+++ b/projects/Samsung/options
@@ -42,9 +42,6 @@
 # setup project defaults
 ################################################################################
 
-  # build and install ALSA Audio support (yes / no)
-    ALSA_SUPPORT="yes"
-
   # OpenGL(X) implementation to use (no / mesa)
     OPENGL="no"