diff --git a/config/functions b/config/functions
index faabc78cb6..6d785b38d9 100644
--- a/config/functions
+++ b/config/functions
@@ -371,7 +371,7 @@ show_config() {
   config_message="$config_message\n - Kodi AFP support:\t\t\t $KODI_AFP_SUPPORT"
   config_message="$config_message\n - Kodi NFS support:\t\t\t $NFS_SUPPORT"
   config_message="$config_message\n - Kodi SAMBA client support:\t\t $SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $UPNP_SUPPORT"
+  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
   config_message="$config_message\n - Kodi Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index ebdfba581d..a4ee5fd12a 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -243,7 +243,7 @@ else
   KODI_WEBSERVER="--disable-webserver"
 fi
 
-if [ "$UPNP_SUPPORT" = yes ]; then
+if [ "$KODI_UPNP_SUPPORT" = yes ]; then
   KODI_UPNP="--enable-upnp"
 else
   KODI_UPNP="--disable-upnp"
diff --git a/projects/Generic/options b/projects/Generic/options
index ce6c97717c..fc5aef9461 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -190,7 +190,7 @@
   AVAHI_DAEMON="yes"
 
 # build with UPnP support (yes / no)
-  UPNP_SUPPORT="yes"
+  KODI_UPNP_SUPPORT="yes"
 
 # build with MySQL support (yes / no)
   MYSQL_SUPPORT="yes"
diff --git a/projects/RPi/options b/projects/RPi/options
index 71afbd0495..fca8146477 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -191,7 +191,7 @@
   AVAHI_DAEMON="yes"
 
 # build with UPnP support (yes / no)
-  UPNP_SUPPORT="yes"
+  KODI_UPNP_SUPPORT="yes"
 
 # build with MySQL support (yes / no)
   MYSQL_SUPPORT="yes"
diff --git a/projects/imx6/options b/projects/imx6/options
index d29e6eb628..81bcb2c522 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -192,7 +192,7 @@
   AVAHI_DAEMON="yes"
 
 # build with UPnP support (yes / no)
-  UPNP_SUPPORT="yes"
+  KODI_UPNP_SUPPORT="yes"
 
 # build with MySQL support (yes / no)
   MYSQL_SUPPORT="yes"