diff --git a/bcmkernel/scripts/bcm_git.sh b/bcmkernel/scripts/bcm_git.sh
index f5241313a0d79d52c995815cbeb45a1578f3547d..f0d1926ad446da2e9a34b3afd775948cad44e3eb 100755
--- a/bcmkernel/scripts/bcm_git.sh
+++ b/bcmkernel/scripts/bcm_git.sh
@@ -177,9 +177,9 @@ import_module()
         done
         )
         ;;
-    wlan-all-src-*|wlan-bin-all-*|wifi_sdkdeps-*)
+    wifi_sdkdeps-*)
         # WLAN binaries and sources are versioned separately. So, the "module" is something
-        # like wlan-all-src-17.10.157.2802 for a tarball like wlan-all-src-17.10.157.2802.cpe5.04L.02.tgz.
+        # like wifi_sdkdeps-17.10.188.75 for a tarball like wifi_sdkdeps-17.10.188.75.cpe5.04L.04test3.tgz.
         # There can be multiple WLAN drivers implementations (impls) applied to the same release.
         # When having two version numbers, if the first three components of the version number are identical,
         # then that tarball most likely contains the same impl, but that is just an observation.
@@ -207,8 +207,8 @@ import_module()
         ;;
     wifi_src-*)
         # The new wifi src packages from 5.04L.03 onwards will only contain the impl src files for the
-        # corresponding impl delivered in the wifi_sdkdeps tarball.
-        # These are to be applied after the wifi_sdkdeps tarball.
+        # corresponding impl delivered in the wifi_sdkdeps tarball. These tarballs are not
+        # SDK-version specific and are to be applied AFTER the wifi_sdkdeps tarball.
 
         # determine which impl this tarball contains (for commit message with parentheses and trailing space)
         shopt -s failglob
@@ -317,14 +317,18 @@ add_release ()
     for module in $bcm_modules
     do
         case "$module" in
-        wlan-all-src-* | wlan-bin-all-* | wifi_sdkdeps-*)
-            # WiFi drivers have their own naming convention like wlan-all-src-17.10.157.2802.cpe5.04L.02.tgz.
+        wifi_sdkdeps-*)
+            # WiFi drivers have their own naming convention like wifi_sdkdeps-17.10.188.75.cpe5.04L.04test3.tgz ...
             tar="${module}.cpe${version}.tgz"
             ;;
         wifi_src-*)
-            # New WiFi drivers from 5.04L.03 onwards have slightly different naming convention
+            # ... and wifi_src-21.2.1-17.10.188.75.tgz
             tar="${module}.tgz"
             ;;
+        wlan-all-src-* | wlan-bin-all-*)
+            echo -e "\t${module} from ${tar} is not supported on this branch. For BCM < 5.04L.03, use release-6.5."
+            return 1
+            ;;
         *)
             tar="bcm963xx_${version}_${module}.tar.gz"
             ;;
@@ -401,10 +405,10 @@ DESCRIPTION
 		extra "modules" to import. The default modules are
 		$BCM_MODULES.
 		Additional modules such as WiFi drivers can be supplied, for example
-		--module wlan-bin-all-17.10.157.2802 --module wlan-all-src-17.10.157.2802
-		to import both binaries and source for a specific WiFi driver version.
-		By convention, specify modules sorted by WiFi driver version number and
-		binaries before sources.
+		--module wifi_sdkdeps-17.10.188.75.cpe5.04L.04.tgz --module wifi_src-21.2.1-17.10.188.75.tgz
+		to import a specific WiFi driver version.
+		IMPORTANT: Specify wifi_sdkdeps first, wifi_src second!
+		By convention, specify modules sorted by WiFi driver version number.
 
 	-t,--tars
 		directory where the Broadcom SDK tar files is located.