diff --git a/bcmkernel/scripts/bcm_git.sh b/bcmkernel/scripts/bcm_git.sh
index a9b55b9333ab9a1a5cd36dd7cf8929faafd5e130..04cfd37aee1048c19a97234b5e0e26e55be8460c 100755
--- a/bcmkernel/scripts/bcm_git.sh
+++ b/bcmkernel/scripts/bcm_git.sh
@@ -196,7 +196,10 @@ import_module()
         # move the files
         rsync -a "$repo/git_tmp/" "$repo/bcm963xx/"
         # sometimes they also include patches
-        apply_bsp_patch_script="$repo/bcm963xx/apply_bsp_patch_all.sh"
+        apply_bsp_patch_script="$repo/bcm963xx/dopatch"  # new patch script from 5.04L.04
+        if ! [ -x "$apply_bsp_patch_script" ]; then
+            apply_bsp_patch_script="$repo/bcm963xx/apply_bsp_patch_all.sh"  # old patch script
+        fi
         if [ -x "$apply_bsp_patch_script" ]; then
             echo "Applying bsp-patches using script $(basename "$apply_bsp_patch_script")"
             (cd "$(dirname "$apply_bsp_patch_script")" && "./$(basename "$apply_bsp_patch_script")")
@@ -405,7 +408,7 @@ DESCRIPTION
 		extra "modules" to import. The default modules are
 		$BCM_MODULES.
 		Additional modules such as WiFi drivers can be supplied, for example
-		--module wifi_sdkdeps-17.10.188.75.cpe5.04L.04.tgz --module wifi_src-21.2.1-17.10.188.75.tgz
+		--module wifi_sdkdeps-17.10.188.75 --module wifi_src-21.2.1-17.10.188.75
 		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.
@@ -437,7 +440,10 @@ for arg in "$@"; do
 done
 
 prerelease=0 # include prerelease ?? that is run add_all or add_release
+bcm_version=
 bcm_extra_modules=
+tar_dir=
+repo_name=
 # parse short opts
 while getopts "hr:R:m:t:p" opt; do
     case ${opt} in
@@ -469,7 +475,7 @@ shift $((OPTIND -1))
 # sanity check.
 if [ -z "$bcm_version" ]
 then
-    echo "one revision needs to be given. ex  -R 5.04L.01 "
+    echo "One revision needs to be given. ex -R 5.04L.01 "
     exit 1
 fi
 
@@ -491,6 +497,18 @@ then
     exit 1
 fi
 
+if [ -z "$bcm_extra_modules" ]
+then
+    echo "You did not specify any extra modules. ex -m wifi_sdkdeps-17.10.188.75 -m wifi_src-21.2.1-17.10.188.75"
+    echo "Are you sure you want to proceed without wifi modules?"
+    select yn in "Yes" "No"; do
+        case $yn in
+            Yes ) break;;
+            No ) exit 1;;
+        esac
+    done
+fi
+
 # if repo do not exist create it
 if [ ! -d ${repo_name} ]
 then