diff --git a/src/format.c b/src/format.c
index d77e2e75..f42dee37 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1870,6 +1870,8 @@ DWORD WINAPI FormatThread(void* param)
 	char drive_letters[27], fs_name[32], label[64];
 	char logfile[MAX_PATH], *userdir;
 	char efi_dst[] = "?:\\efi\\boot\\bootx64.efi";
+	char appraiserres_dll_src[] = "?:\\sources\\appraiserres.dll";
+	char appraiserres_dll_dst[] = "?:\\sources\\appraiserres.bak";
 	char kolibri_dst[] = "?:\\MTLD_F32";
 	char grub4dos_dst[] = "?:\\grldr";
 
@@ -2358,6 +2360,18 @@ DWORD WINAPI FormatThread(void* param)
 						FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_PATCH);
 				}
 				if (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_EXTENDED) {
+					// Create a backup of sources\appraiserres.dll and then create an empty file to
+					// allow in-place upgrades without TPM/SB. Note that we need to create an empty,
+					// appraiserres.dll otherwise setup.exe extracts its own.
+					appraiserres_dll_src[0] = drive_name[0];
+					appraiserres_dll_dst[0] = drive_name[0];
+					uprintf("Renaming: '%s' → '%s'", appraiserres_dll_src, appraiserres_dll_dst);
+					if (!MoveFileExU(appraiserres_dll_src, appraiserres_dll_dst, MOVEFILE_REPLACE_EXISTING))
+						uprintf("  Rename failed: %s", WindowsErrorString());
+					else
+						CloseHandle(CreateFileU(appraiserres_dll_src, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ,
+							NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
+					// Now patch for boot-time TPM/SB checks.
 					if (!RemoveWindows11Restrictions(drive_name[0]))
 						FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_CANT_PATCH);
 				}
diff --git a/src/rufus.rc b/src/rufus.rc
index 990176f9..920f5467 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.18.1870"
+CAPTION "Rufus 3.18.1871"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,18,1870,0
- PRODUCTVERSION 3,18,1870,0
+ FILEVERSION 3,18,1871,0
+ PRODUCTVERSION 3,18,1871,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.18.1870"
+            VALUE "FileVersion", "3.18.1871"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.18.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.18.1870"
+            VALUE "ProductVersion", "3.18.1871"
         END
     END
     BLOCK "VarFileInfo"