diff --git a/bin/build-helper b/bin/build-helper
index d1f30fc3..725c076f 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -225,7 +225,7 @@ eof
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -ge 2]
+        if [ $# -eq 2]
         then
             rm -f "${archivename}"
         fi
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index 0a656f5e..dee12d0e 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -260,7 +260,7 @@ eof
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -ge 2]
+        if [ $# -eq 2]
         then
             rm -f "${archivename}"
         fi
@@ -346,6 +346,8 @@ eof
             freebsd)
                 # if we are not Nico :) then just push, no mirror
                 git push
+                # push also new branch and set up tracking
+                git push -u origin "${target_branch}"
             ;;
             *)
                 make helper=${helper} WEBDIR=${WEBDIR} pub