diff --git a/bcmkernel/scripts/bcm_git.sh b/bcmkernel/scripts/bcm_git.sh
index e4504d0716285a378ef96c8cab6d3cca6a5d524f..d47d4426f771568a372047f63047ff829bd868a6 100755
--- a/bcmkernel/scripts/bcm_git.sh
+++ b/bcmkernel/scripts/bcm_git.sh
@@ -48,10 +48,8 @@ create_new_repo ()
     (
         cd_repo $repo
         git init
-        echo "Master branch not used"  > readme.md
-        git add readme.md
-        git commit -m "created repo"
-        git branch broadcom
+        git checkout -b broadcom
+        git commit --allow-empty -m "Initial (empty) commit"
     )
     echo "-------------------------------------------------------------------------------"
 }
@@ -128,7 +126,7 @@ import_module()
 
         # prep repo. clean out all old files
         git -C ${repo} checkout broadcom
-        git -C ${repo} rm -rq .
+        git -C ${repo} rm --ignore-unmatch -rq .
         ;;
     *)
         # for all addon-modules, branch off from data_full_release tag