diff --git a/config/functions b/config/functions
index 6d785b38d9..0e46a557fe 100644
--- a/config/functions
+++ b/config/functions
@@ -372,7 +372,7 @@ show_config() {
   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 $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $WEBSERVER"
+  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
 
   # OS configuration
 
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index a4ee5fd12a..b0bf06f4bb 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -236,7 +236,7 @@ else
   KODI_SAMBA="--disable-samba"
 fi
 
-if [ "$WEBSERVER" = yes ]; then
+if [ "$KODI_WEBSERVER_SUPPORT" = yes ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libmicrohttpd"
   KODI_WEBSERVER="--enable-webserver"
 else
diff --git a/projects/Generic/options b/projects/Generic/options
index fc5aef9461..a7bb413c9b 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -184,7 +184,7 @@
   BLUETOOTH_SUPPORT="yes"
 
 # build and install with KODI webfrontend (yes / no)
-  WEBSERVER="yes"
+  KODI_WEBSERVER_SUPPORT="yes"
 
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
diff --git a/projects/RPi/options b/projects/RPi/options
index fca8146477..72882d217b 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -185,7 +185,7 @@
   BLUETOOTH_SUPPORT="yes"
 
 # build and install with KODI webfrontend (yes / no)
-  WEBSERVER="yes"
+  KODI_WEBSERVER_SUPPORT="yes"
 
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
diff --git a/projects/imx6/options b/projects/imx6/options
index 81bcb2c522..4193dfa662 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -186,7 +186,7 @@
   BLUETOOTH_SUPPORT="yes"
 
 # build and install with KODI webfrontend (yes / no)
-  WEBSERVER="yes"
+  KODI_WEBSERVER_SUPPORT="yes"
 
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"