diff --git a/config/functions b/config/functions
index 8de135926d..6a4cfe6080 100644
--- a/config/functions
+++ b/config/functions
@@ -363,6 +363,7 @@ show_config() {
 
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
   config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
@@ -371,7 +372,7 @@ show_config() {
   config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_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 $KODI_NFS_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_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 $KODI_WEBSERVER_SUPPORT"
 
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index e883c8dad2..651125e1d1 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -229,7 +229,7 @@ else
   KODI_AFP="--disable-afpclient"
 fi
 
-if [ "$SAMBA_SUPPORT" = yes ]; then
+if [ "$KODI_SAMBA_SUPPORT" = yes ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba"
   KODI_SAMBA="--enable-samba"
 else
diff --git a/projects/Generic/options b/projects/Generic/options
index e167e33f71..0643f5c2d8 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -218,12 +218,15 @@
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
   KODI_AFP_SUPPORT="no"
 
-# build and install Samba Client support (yes / no)
-  SAMBA_SUPPORT="yes"
+# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
+  KODI_SAMBA_SUPPORT="yes"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="yes"
 
+# build with Samba Client support (mounting samba shares via the OS) (yes / no)
+  SAMBA_SUPPORT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index c91821fe83..889ffbc5f7 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -219,12 +219,15 @@
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
   KODI_AFP_SUPPORT="no"
 
-# build and install Samba Client support (yes / no)
-  SAMBA_SUPPORT="yes"
+# build with Samba Client (mounting SAMBA shares with KODI) (yes / no)
+  KODI_SAMBA_SUPPORT="yes"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="yes"
 
+# build with Samba Client support (mounting samba shares via the OS) (yes / no)
+  SAMBA_SUPPORT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
diff --git a/projects/imx6/options b/projects/imx6/options
index 3e3d28870c..fde014edcd 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -220,12 +220,15 @@
 # build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
   KODI_AFP_SUPPORT="no"
 
-# build and install Samba Client support (yes / no)
-  SAMBA_SUPPORT="yes"
+# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
+  KODI_SAMBA_SUPPORT="yes"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="yes"
 
+# build with Samba Client support (mounting samba shares via the OS) (yes / no)
+  SAMBA_SUPPORT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"