diff --git a/packages/multimedia/libaacs/build b/packages/multimedia/libaacs/build
new file mode 100755
index 0000000000..dbbcde8fa2
--- /dev/null
+++ b/packages/multimedia/libaacs/build
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-static \
+            --enable-shared \
+            --disable-werror \
+            --disable-extra-warnings \
+            --disable-optimizations \
+            --disable-examples \
+            --disable-debug \
+            --with-gnu-ld
+
+make
+
+$MAKEINSTALL
diff --git a/packages/multimedia/libaacs/install b/packages/multimedia/libaacs/install
new file mode 100755
index 0000000000..6ed16551eb
--- /dev/null
+++ b/packages/multimedia/libaacs/install
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/config/aacs
+  cp -P $PKG_BUILD/KEYDB.cfg $INSTALL/usr/config/aacs
diff --git a/packages/multimedia/libaacs/meta b/packages/multimedia/libaacs/meta
new file mode 100644
index 0000000000..bad3dc429b
--- /dev/null
+++ b/packages/multimedia/libaacs/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libaacs"
+PKG_VERSION="0.3.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.videolan.org/developers/libaacs.html"
+PKG_URL="ftp://ftp.videolan.org/pub/videolan/libaacs/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libgcrypt"
+PKG_BUILD_DEPENDS="toolchain libgcrypt"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libaacs: a research project to implement the Advanced Access Content System specification."
+PKG_LONGDESC="libaacs is a research project to implement the Advanced Access Content System specification. This research project provides, through an open-source library, a way to understand how the AACS works. This research project is mainly developed by an international team of developers from Doom9."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/multimedia/libbluray/meta b/packages/multimedia/libbluray/meta
index ca5dc6e27f..0dca8e9785 100644
--- a/packages/multimedia/libbluray/meta
+++ b/packages/multimedia/libbluray/meta
@@ -34,3 +34,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
+  PKG_DEPENDS="$PKG_DEPENDS libaacs"
+fi