diff --git a/sicherboot b/sicherboot
index 8b47b4a..c27f160 100755
--- a/sicherboot
+++ b/sicherboot
@@ -172,8 +172,11 @@ BOOTCTL_HELP="Usage: sicherboot bootctl [<argument> ...]
   systemd-boot${EFI_ARCH}.efi
 "
 bootctl() {
-    command bootctl --path="$BOOT_EFI_DIR" "$@"
-    sign_image "$BOOT_EFI_DIR/EFI/systemd/systemd-boot${EFI_ARCH}.efi"
+    PATHS=`command bootctl --path="$BOOT_EFI_DIR" "$@" 2>&1 | grep $BOOT_EFI_DIR | cut -d'"' -f 4`
+    for item in $PATHS
+    do
+      sign_image "$item"
+    done
 }
 
 
diff --git a/tests/test-setup b/tests/test-setup
index 174f5a1..592121b 100755
--- a/tests/test-setup
+++ b/tests/test-setup
@@ -50,6 +50,7 @@ testsuccess test -e tmp/efi/loader/entries/machine-id-keytool.conf
 cat >> $PWD/tmp/bootctl << EOF
 #!/bin/sh
 install -D /usr/lib/systemd/boot/efi/systemd-boot${EFI_ARCH}.efi $PWD/tmp/efi/EFI/systemd/systemd-boot${EFI_ARCH}.efi
+echo "Copied \"/usr/lib/systemd/boot/efi/systemd-boot${EFI_ARCH}.efi\" to \"$PWD/tmp/efi/EFI/systemd/systemd-bootx64.efi\"."
 EOF
 
 chmod +x $PWD/tmp/bootctl