diff --git a/qemu.changes b/qemu.changes
index 1e91ac06..d64141ae 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,12 +1,12 @@
 -------------------------------------------------------------------
-Fri Mar 25 18:44:04 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
+Tue Mar 29 09:36:34 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
 
 - Add missing patch from a PTFs (bsc#1194938)
 * Patches added:
   scsi-generic-check-for-additional-SG_IO-.patch
 
 -------------------------------------------------------------------
-Fri Mar 25 17:44:06 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
+Fri Mar 25 18:44:04 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
 
 - Kill downstream patches around bifmt handling that makes
   cumbersome to run multi-arch containers, and switch to the
@@ -18,6 +18,13 @@ Fri Mar 25 17:44:06 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
   qemu-binfmt-conf.sh-allow-overriding-SUS.patch
   qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch
 
+-------------------------------------------------------------------
+Fri Mar 25 17:44:06 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
+
+- Fix update_git.sh wiping all the package file of the local
+  checkout while cloning the git repository on demand (in case they
+  don't exist and the user as to do so).
+
 -------------------------------------------------------------------
 Thu Mar 24 11:18:54 UTC 2022 - Li Zhang <li.zhang@suse.com>
 
diff --git a/update_git.sh b/update_git.sh
index 07d0d80a..740fc21f 100644
--- a/update_git.sh
+++ b/update_git.sh
@@ -839,6 +839,15 @@ fi
 
 #==============================================================================
 
+# cleanup directories from any previous failed run:
+rm -rf /dev/shm/qemu-???????-git-dir
+rm -rf /dev/shm/qemu-???????-cmp-dir
+rm -rf /dev/shm/qemu-???????-bun-dir
+# Temporary directories used in this script
+GIT_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-git-dir)
+CMP_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-cmp-dir)
+BUN_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-bun-dir)
+
 if [[ ! -e $(readlink -f ${LOCAL_REPO_MAP[0]}) ]]; then
     echo "No local repo found at ${LOCAL_REPO_MAP[0]}"
     if [ "$GIT_UPSTREAM_COMMIT_ISH" = "LATEST" ]; then
@@ -949,15 +958,6 @@ for (( i=0; i <$REPO_COUNT; i++ )); do
     fi
 done
 
-# cleanup directories from any previous failed run:
-rm -rf /dev/shm/qemu-???????-git-dir
-rm -rf /dev/shm/qemu-???????-cmp-dir
-rm -rf /dev/shm/qemu-???????-bun-dir
-# Temporary directories used in this script
-GIT_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-git-dir)
-CMP_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-cmp-dir)
-BUN_DIR=$(mktemp -d /dev/shm/qemu-XXXXXXX-bun-dir)
-
 if [ "$GIT_UPSTREAM_COMMIT_ISH" = "LATEST" ]; then
     if [ "$1" = "continue" ]; then
         CONTINUE_AFTER_REBASE=1