diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index a31108cdb3..14f200da22 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -164,6 +164,12 @@ else
   XBMC_SSH="--disable-ssh"
 fi
 
+if [ "$OPTICAL_DRIVE_SUPPORT" = yes ]; then
+  XBMC_OPTICAL="--enable-optical-drive"
+else
+  XBMC_OPTICAL="--disable-optical-drive"
+fi
+
 if [ "$NFS_SUPPORT" = yes ]; then
   XBMC_NFS="--enable-nfs"
 else
@@ -307,7 +313,7 @@ cd $PKG_BUILD
             $XBMC_NONFREE \
             --disable-asap-codec \
             $XBMC_WEBSERVER \
-            --enable-optical-drive \
+            $XBMC_OPTICAL \
             $XBMC_BLURAY \
             --enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \
             --disable-external-libraries \
diff --git a/projects/ATV/options b/projects/ATV/options
index 9fcd1dc8d1..b544ea619d 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -184,6 +184,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 1b36b56e83..00a188d25b 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # 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 50793bc525..71a0d6e8a9 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 3c346b3e49..d6fb78b838 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/ION/options b/projects/ION/options
index af52f36042..ec08935ee8 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 42d89a2b4a..c7bbb49e8c 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # 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 2dad9e55b4..570a89d588 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 93624c8e6a..1b3d95f45c 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -183,6 +183,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Virtual/options b/projects/Virtual/options
index b3c0713cbe..0e1bbe6937 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -178,6 +178,9 @@
 # build xbmc with sshlib support (yes / no)
   SSHLIB_SUPPORT="yes"
 
+# build xbmc with optical drive support (yes / no)
+  OPTICAL_DRIVE_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"