diff --git a/config/functions b/config/functions
index a91454cbb2..faabc78cb6 100644
--- a/config/functions
+++ b/config/functions
@@ -368,7 +368,7 @@ show_config() {
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
   config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
   config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi AFP support:\t\t\t $AFP_SUPPORT"
+  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"
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 5fa3563e88..99efe79463 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -222,7 +222,7 @@ else
   KODI_NFS="--disable-nfs"
 fi
 
-if [ "$AFP_SUPPORT" = yes ]; then
+if [ "$KODI_AFP_SUPPORT" = yes ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET afpfs-ng"
   KODI_AFP="--enable-afpclient"
 else
diff --git a/projects/Generic/options b/projects/Generic/options
index 9635e46257..b898fd0de9 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -216,7 +216,7 @@
   NFS_SUPPORT="yes"
 
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  AFP_SUPPORT="no"
+  KODI_AFP_SUPPORT="no"
 
 # build and install Samba Client support (yes / no)
   SAMBA_SUPPORT="yes"
diff --git a/projects/RPi/options b/projects/RPi/options
index c68eb0ab90..8094f7fdcc 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -217,7 +217,7 @@
   NFS_SUPPORT="yes"
 
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  AFP_SUPPORT="no"
+  KODI_AFP_SUPPORT="no"
 
 # build and install Samba Client support (yes / no)
   SAMBA_SUPPORT="yes"
diff --git a/projects/imx6/options b/projects/imx6/options
index 11d05a4d38..801b7a6332 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -218,7 +218,7 @@
   NFS_SUPPORT="yes"
 
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  AFP_SUPPORT="no"
+  KODI_AFP_SUPPORT="no"
 
 # build and install Samba Client support (yes / no)
   SAMBA_SUPPORT="yes"