diff --git a/tools/mkpkg/update_binary-addons b/tools/mkpkg/update_binary-addons
index 196db818c2..fa9f2fb520 100755
--- a/tools/mkpkg/update_binary-addons
+++ b/tools/mkpkg/update_binary-addons
@@ -167,6 +167,10 @@ for addontxt in ${ADDONS_REPO_LOCATION}/*-addons.txt ; do
     PROCESSED="${PROCESSED}${ADDON}\n"
   done
 
+  if [ "${KEEP_GIT_DIRS}" != "yes" ]; then
+    [ -d "${ADDONS_GIT_DIR}" ] && rm -rf "${ADDONS_GIT_DIR}"
+  fi
+
   echo
   echo "The following addons were skipped, please add packages for these addons:"
   echo "[${SKIPPED_ADDONS}]"