diff --git a/include/git.sh b/include/git.sh
index 1942a53b..519ae4d3 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -5,7 +5,6 @@
 # This file is only used by update/project/trees
 
 eval "$(setvars "" _target rev _xm loc url bkup_url depend patchfail)"
-tmp_git_dir="${PWD}/tmp/gitclone"
 
 fetch_project_trees()
 {
@@ -59,7 +58,6 @@ prepare_new_tree()
 {
 	printf "Creating %s tree %s (%s)\n" "$project" "$tree" "$_target"
 
-	remkdir "${tmp_git_dir%/*}"
 	cp -R "src/${project}/${project}" "${tmp_git_dir}" || \
 	    err "prepare_new_tree ${project}/${tree}: can't make tmpclone"
 	git_patch "$tmp_git_dir" "$PWD/$cfgsdir/$tree/patches"
@@ -91,8 +89,6 @@ verify_config()
 
 clone_project()
 {
-	remkdir "${tmp_git_dir%/}"
-
 	loc="${loc#src/}"
 	loc="src/${loc}"
 	if [ -d "${loc}" ]; then
diff --git a/include/option.sh b/include/option.sh
index 7c434444..66b89d4c 100755
--- a/include/option.sh
+++ b/include/option.sh
@@ -12,6 +12,7 @@ cbfstool="cbutils/default/cbfstool"
 grubcfgsdir="config/grub"
 layoutdir="/boot/grub/layouts"
 . "${grubcfgsdir}/modules.list"
+tmp_git_dir="${PWD}/tmp/gitclone"
 
 eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \
     CONFIG_ME_BIN_PATH CONFIG_KBC1126_FIRMWARE CONFIG_KBC1126_FW1 \
diff --git a/script/update/trees b/script/update/trees
index 00ba83f1..fac37ccd 100755
--- a/script/update/trees
+++ b/script/update/trees
@@ -37,6 +37,7 @@ main()
 	elfdir="elf/${project}"
 	cfgsdir="config/${project}"
 
+	remkdir "${tmp_git_dir%/*}"
 	check_project
 
 	_cmd="build_projects"