diff --git a/toCOPY/generate-centos-repo.sh b/toCOPY/generate-centos-repo.sh
index 48eadcf9..9bdb7fcf 100755
--- a/toCOPY/generate-centos-repo.sh
+++ b/toCOPY/generate-centos-repo.sh
@@ -183,13 +183,13 @@ if [ ! -d "${dest_dir}" ]; then
 fi
 
 for t in "Binary" "Source" ; do
-    target_dir=${dest_dir}/$t
-    if [ ! -d "$target_dir" ]; then
-        mkdir -p "$target_dir"
-    else
-        mv -f "$target_dir" "$target_dir-backup-$timestamp"
-        mkdir -p "$target_dir"
+    target_dir=${dest_dir}/${t}
+
+    if [ -d "${target_dir}" ]; then
+        mv -f "${target_dir}" "${target_dir}-backup-${timestamp}"
     fi
+
+    mkdir -p "${target_dir}"
 done
 
 #
diff --git a/toCOPY/populate_downloads.sh b/toCOPY/populate_downloads.sh
index e434becf..0a02fb62 100755
--- a/toCOPY/populate_downloads.sh
+++ b/toCOPY/populate_downloads.sh
@@ -91,7 +91,12 @@ if [ -f  ${extra_downloads_lst} ]; then
 fi
 
 
-mkdir -p ${MY_REPO}/stx/downloads
+if [ -d "${downloads_dir}" ]; then
+    timestamp="$(date +%F_%H%M)"
+    mv -f "${downloads_dir}" "${downloads_dir}-backup-${timestamp}"
+fi
+
+mkdir -p ${downloads_dir}
 
 grep -v "^#" ${tarball_lst} | while read x; do
     if [ -z "$x" ]; then