diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 1f98267f4..a0cbb1866 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -202,10 +202,13 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 comment "shairport support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
+comment "samba support needs an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
+
 config BR2_PACKAGE_KODI_LIBSMBCLIENT
 	bool "samba"
-	select BR2_PACKAGE_SAMBA
-	select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_SAMBA4
 	help
 	  Enable Samba support
 
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index ca8563dd1..ad73dcbc1 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -140,7 +140,7 @@ KODI_CONF_OPTS += --disable-webserver
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y)
-KODI_DEPENDENCIES += samba
+KODI_DEPENDENCIES += samba4
 KODI_CONF_OPTS += --enable-samba
 else
 KODI_CONF_OPTS += --disable-samba