--- a/Make.common	2022-04-12 02:04:28.000000000 +0100
+++ b/Make.common	2022-08-08 21:29:50.710841979 +0100
@@ -17,10 +17,11 @@
 # used to compile rEFInd....
 #
 
+LIBDIR          ?= /usr/lib
 EFIINC          = /usr/include/efi
-GNUEFILIB       = /usr/lib
-EFILIB          = /usr/lib
-EFICRT0         = /usr/lib
+GNUEFILIB       = $(LIBDIR)
+EFILIB          = $(LIBDIR)
+EFICRT0         = $(LIBDIR)/gnuefi
 
 # Comment out above and uncomment below if using locally-compiled GNU-EFI....
 #EFIINC          = /usr/local/include/efi
--- a/refind-install	2022-04-12 18:02:46.000000000 +0100
+++ b/refind-install	2022-08-08 21:33:56.862056764 +0100
@@ -1223,19 +1223,23 @@
    done
 } # FindLinuxESP()
 
-# Identifies the ESP's location (/boot, /boot/efi, /efi, or these locations
+# Identifies the ESP's location (/boot, /boot/efi, /boot/EFI, /efi, or these locations
 # under the directory specified by --root); aborts if the ESP isn't mounted at
 # any of these locations.
 # Sets InstallDir to the ESP mount point.
 FindMountedESP() {
    mount /boot &> /dev/null
    mount /boot/efi &> /dev/null
+   mount /boot/EFI &> /dev/null
    mount /efi &> /dev/null
    EspLine=$(df "$RootDir/efi" 2> /dev/null | grep efi)
    if [[ -z "$EspLine" ]] ; then
       EspLine=$(df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi)
    fi
    if [[ -z "$EspLine" ]] ; then
+      EspLine=$(df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI)
+   fi
+   if [[ -z "$EspLine" ]] ; then
       EspLine=$(df "$RootDir"/boot 2> /dev/null | grep boot)
    fi
    InstallDir=$(echo "$EspLine" | xargs | cut -d " " -f 6 | sed 's/\/\+/\//g')
@@ -1248,8 +1252,8 @@
    fi
    if [[ $EspFilesystem != 'vfat' ]] ; then
       echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be"
-      echo "mounted at $RootDir/boot, $RootDir/efi, or $RootDir/boot/efi, and it must be"
-      echo "VFAT (not msdos)! Aborting!"
+      echo "mounted at $RootDir/boot, $RootDir/efi, $RootDir/boot/efi, or $RootDir/boot/EFI,"
+      echo "and it must be VFAT (not msdos)! Aborting!"
       if [[ -d /sys/firmware/efi ]] ; then
          exit 1
       else