diff --git a/packages/mediacenter/package.mk b/packages/mediacenter/package.mk
index dca64aba16..03260c718b 100644
--- a/packages/mediacenter/package.mk
+++ b/packages/mediacenter/package.mk
@@ -42,6 +42,13 @@ if [ "$MEDIACENTER" = "xbmc" -o "$MEDIACENTER" = "xbmc-master" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET simplejson"
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
 
+# XBMC audio encoder addons
+  if [ "$MEDIACENTER" = "xbmc-master" -a "$OPTICAL_DRIVE_SUPPORT" = "yes" ]; then
+    for audioencoder in $XBMC_AUDIOENCODER_ADDONS; do
+      PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-audioencoder-$audioencoder"
+    done
+  fi
+
 # various PVR clients
   if [ "$MEDIACENTER" = "xbmc-master" ]; then
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons-master"
diff --git a/projects/ATV/options b/projects/ATV/options
index 8884959fb7..8fc9425bed 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -202,6 +202,11 @@
 # build xbmc with optical drive support (yes / no)
   OPTICAL_DRIVE_SUPPORT="yes"
 
+# XBMC Audio encoders for usage with optical drive support
+# Space separated list is supported,
+# e.g. XBMC_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
+  XBMC_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 709ccde68f..d9ea1bb59a 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -197,6 +197,11 @@
 # build xbmc with optical drive support (yes / no)
   OPTICAL_DRIVE_SUPPORT="yes"
 
+# XBMC Audio encoders for usage with optical drive support
+# Space separated list is supported,
+# e.g. XBMC_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
+  XBMC_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 81fc3a8086..45aa50e7be 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -202,6 +202,11 @@
 # build xbmc with optical drive support (yes / no)
   OPTICAL_DRIVE_SUPPORT="yes"
 
+# XBMC Audio encoders for usage with optical drive support
+# Space separated list is supported,
+# e.g. XBMC_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
+  XBMC_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index 8b5b99b3aa..bc1e645f16 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -203,6 +203,11 @@
 # build xbmc with optical drive support (yes / no)
   OPTICAL_DRIVE_SUPPORT="yes"
 
+# XBMC Audio encoders for usage with optical drive support
+# Space separated list is supported,
+# e.g. XBMC_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
+  XBMC_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"