===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.114
retrieving revision 1.117
diff -u -r1.114 -r1.117
--- openbsd/update_openbsd/update_openbsd	2018/12/16 20:49:58	1.114
+++ openbsd/update_openbsd/update_openbsd	2018/12/16 20:57:49	1.117
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.113 2018/12/16 20:31:06 andrew Exp $
+# $AFresh1: update_openbsd,v 1.116 2018/12/16 20:55:24 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -486,12 +486,15 @@
     [ $_d != / ] && mount | grep -q " on ${_d%/} .* msdos" && mount_is_msdos=1
 
     if [ "$EFI_BOOT" -a -d /mnt/efi/boot ]; then
-       echo "Copying $EFI_BOOT to /mnt/efi/boot/$EFI_BOOT"
-       cp "$EFI_BOOT" "/mnt/efi/boot/"
+       echo "Copying $EFI_BOOT to /mnt/efi/boot/"
+       ( cd /mnt/efi/boot \
+         && cp "$RELEASEDIR/$EFI_BOOT" "n$EFI_BOOT" \
+         && mv "n$EFI_BOOT" "$EFI_BOOT"
+       )
     fi
 
     if [ X"$BOOT_KERNEL_VERSION" != X"$NEW_KERNEL_VERSION" ]; then
-        echo "===> Backing up $BOOT_KERNEL to ${_d}obsd"
+        echo "===> Backing up ${_d}$BOOT_KERNEL to ${_d}obsd"
         if [ $mount_is_msdos ]; then
             cp ${_d}$BOOT_KERNEL ${_d}obsd
         else