diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk
index e34db7b35d..07a34727ad 100644
--- a/packages/multimedia/libbluray/package.mk
+++ b/packages/multimedia/libbluray/package.mk
@@ -35,8 +35,8 @@ 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
-  PKG_DEPENDS="$PKG_DEPENDS libaacs"
+if [ "$AACS_SUPPORT" = "yes" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS $LIBAACS"
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index edc5f67463..3cbc4b2906 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/ATV/options b/projects/ATV/options
index 0f4e652ccd..8a151d9029 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 10b4ddb06e..6037b2211a 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index f1922e25ce..8a7a44f2a8 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 4db66486b2..f0c7d29640 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 11164213ff..94881e8dd6 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index 60f1b871e5..9747cea7e6 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/RPi/options b/projects/RPi/options
index db9302ea22..19a282301b 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -150,6 +150,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 5e7f2321cc..f1e36ed4e2 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -145,6 +145,13 @@
 # (RAR compression support in XBMC) (yes / no)
   NONFREE_SUPPORT="yes"
 
+# build and install with AACS support
+# (BD decryption support in libbluray) (yes / no)
+  AACS_SUPPORT="yes"
+
+# AACS library to use ( libaacs / makemkv-oss )
+  LIBAACS="makemkv-oss"
+
 # build and install with DVDCSS support
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"