diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk
index 2fa01a733a..dc10c8dd0d 100644
--- a/packages/multimedia/libbluray/package.mk
+++ b/packages/multimedia/libbluray/package.mk
@@ -32,7 +32,7 @@ PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs pla
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-if [ "$NONFREE_SUPPORT" = "yes" ]; then
+if [ "$AACS_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
 fi
 
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 3950322f07..d13cc00d79 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -161,13 +161,17 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
+# build and install with AACS support
+# (BD decryption support in XBMC) (yes / no)
+  AACS_SUPPORT="yes"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with BluRay support (yes / no)
-  BLURAY_SUPPORT="yes"
-
 # additional drivers to install:
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
diff --git a/projects/Generic/options b/projects/Generic/options
index d0121d29df..f0d57dbdd0 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -159,13 +159,17 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
+# build and install with AACS support
+# (BD decryption support in XBMC) (yes / no)
+  AACS_SUPPORT="yes"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with BluRay support (yes / no)
-  BLURAY_SUPPORT="yes"
-
 # additional drivers to install:
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
diff --git a/projects/RPi/options b/projects/RPi/options
index a708307326..3b91c16327 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -160,13 +160,17 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
+# build and install with AACS support
+# (BD decryption support in XBMC) (yes / no)
+  AACS_SUPPORT="yes"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
-# build and install with BluRay support (yes / no)
-  BLURAY_SUPPORT="yes"
-
 # additional drivers to install:
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,