diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 9285244e65..eed5f4c3b4 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -157,7 +157,7 @@ else
   KODI_JOYSTICK="--disable-joystick"
 fi
 
-if [ "$OPTICAL_DRIVE_SUPPORT" = yes ]; then
+if [ "$KODI_OPTICAL_SUPPORT" = yes ]; then
   KODI_OPTICAL="--enable-optical-drive"
 else
   KODI_OPTICAL="--disable-optical-drive"
diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index b4521f4b57..b7bf1ab9b4 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -43,7 +43,7 @@ if [ "$MEDIACENTER" = "kodi" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
 
 # Kodi audio encoder addons
-  if [ "$OPTICAL_DRIVE_SUPPORT" = "yes" ]; then
+  if [ "$KODI_OPTICAL_SUPPORT" = "yes" ]; then
     for audioencoder in $KODI_AUDIOENCODER_ADDONS; do
       PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-audioencoder-$audioencoder"
     done
diff --git a/projects/Generic/options b/projects/Generic/options
index eddfd7ec43..406076e178 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -199,7 +199,7 @@
   KODI_SSHLIB_SUPPORT="yes"
 
 # build xbmc with optical drive support (yes / no)
-  OPTICAL_DRIVE_SUPPORT="yes"
+  KODI_OPTICAL_SUPPORT="yes"
 
 # KODI Audio encoders for usage with optical drive support
 # Space separated list is supported,
diff --git a/projects/RPi/options b/projects/RPi/options
index 33652f121a..fffbd6aa4b 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -200,7 +200,7 @@
   KODI_SSHLIB_SUPPORT="yes"
 
 # build xbmc with optical drive support (yes / no)
-  OPTICAL_DRIVE_SUPPORT="yes"
+  KODI_OPTICAL_SUPPORT="yes"
 
 # KODI Audio encoders for usage with optical drive support
 # Space separated list is supported,
diff --git a/projects/imx6/options b/projects/imx6/options
index 26a96db068..9a229f03b6 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -201,7 +201,7 @@
   KODI_SSHLIB_SUPPORT="yes"
 
 # build xbmc with optical drive support (yes / no)
-  OPTICAL_DRIVE_SUPPORT="yes"
+  KODI_OPTICAL_SUPPORT="yes"
 
 # KODI Audio encoders for usage with optical drive support
 # Space separated list is supported,