diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor
index 5746eb252d..7f84b9d9e5 100755
--- a/basis/io/windows/files/files.factor
+++ b/basis/io/windows/files/files.factor
@@ -178,7 +178,8 @@ M: windows >directory-entry ( byte-array -- directory-entry )
     [ WIN32_FIND_DATA-cFileName utf16n alien>string ]
     [ WIN32_FIND_DATA-dwFileAttributes win32-file-type ]
     [ WIN32_FIND_DATA-dwFileAttributes win32-file-attributes ]
-    tri windows-directory-entry boa ;
+    tri
+    dupd remove windows-directory-entry boa ;
 
 : WIN32_FIND_DATA>file-info ( WIN32_FIND_DATA -- file-info )
     [ \ windows-file-info new ] dip
diff --git a/build-support/factor.sh b/build-support/factor.sh
index 1a4aa9f965..b2b6ad1ff9 100755
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -374,6 +374,7 @@ backup_factor() {
     $ECHO "Backing up factor..."
     $COPY $FACTOR_BINARY $FACTOR_BINARY.bak
     $COPY $FACTOR_LIBRARY $FACTOR_LIBRARY.bak
+    $COPY $BOOT_IMAGE $BOOT_IMAGE.bak
     $COPY $FACTOR_IMAGE $FACTOR_IMAGE.bak
     $ECHO "Done with backup."
 }
@@ -406,7 +407,8 @@ make_factor() {
 update_boot_images() {
     echo "Deleting old images..."
     $DELETE checksums.txt* > /dev/null 2>&1
-    $DELETE $BOOT_IMAGE.* > /dev/null 2>&1
+	# delete boot images with one or two characters after the dot
+    $DELETE $BOOT_IMAGE.{?,??} > /dev/null 2>&1
     $DELETE temp/staging.*.image > /dev/null 2>&1
     if [[ -f $BOOT_IMAGE ]] ; then
         get_url http://factorcode.org/images/latest/checksums.txt