diff --git a/ChangeLog.txt b/ChangeLog.txt
index b3266f7c..c1786dd3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+o Version 3.21 (2022.11.??)
+    Allow the provision of an arbitrary local account username
+    Improve Windows version reporting from ISO/.wim
+    Update UEFI:NTFS' NTFS drivers to v1.4 and exFAT drivers to v1.9
+    Switch to remote download for nonstandard GRUB (Fedora 37, openSUSE Live, GeckoLinux)
+    Fix UEFI:NTFS partition not being set in MBR mode for ISOs with a >4GB file (UwUntu)
+    Fix GRUB support for Arch and derivatives, when a non FAT compliant label is used
+    Fix incorrect detection of GRUB with nonstandard prefixes
+    Fix tab order not working on the Windows Use Experience dialog
+
 o Version 3.20 (2022.08.03)
     Enable applicable Windows User Experience options for Windows 10
     Remember last Windows User Experience selection between sessions
diff --git a/res/uefi/readme.txt b/res/uefi/readme.txt
index de5daf7b..091cf3b2 100644
--- a/res/uefi/readme.txt
+++ b/res/uefi/readme.txt
@@ -3,18 +3,18 @@ Rufus for NTFS and exFAT UEFI boot support.
 
 See https://github.com/pbatard/uefi-ntfs for more details.
 
-This image, which you can mount as FAT filesystem or open in 7-zip, contains
-the following data:
+This image, which can be mounted as a FAT file system or opened in 7-zip,
+contains the following data:
 
 o Secure Boot signed NTFS UEFI drivers, derived from ntfs-3g [1].
-  These drivers are the exact same as the read-only binaries from release 1.3,
+  These drivers are the exact same as the read-only binaries from release 1.4,
   except for the addition of Microsoft's Secure Boot signature.
   Note that, per Microsoft's current Secure Boot signing policies, the 32-bit
   ARM driver (ntfs_arm.efi) is not Secure Boot signed.
 
 o Non Secure Boot signed exFAT UEFI drivers from EfiFs [2].
-  These drivers are the exact same as the binaries from EfiFs release 1.8 and
-  because they are licensed under GPLv3, they cannot be Secure Boot signed.
+  These drivers are the exact same as the binaries from EfiFs release 1.9 but,
+  because they are licensed under GPLv3, cannot be Secure Boot signed.
 
 o Secure Boot signed UEFI:NTFS bootloader binaries [3].
   These drivers are the exact same as the binaries from release 2.2, except for
diff --git a/res/uefi/uefi-ntfs.img b/res/uefi/uefi-ntfs.img
index f345f6e7..813716f3 100644
Binary files a/res/uefi/uefi-ntfs.img and b/res/uefi/uefi-ntfs.img differ
diff --git a/src/rufus.rc b/src/rufus.rc
index 204cf668..b14e9b5b 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.21.1946"
+CAPTION "Rufus 3.21.1947"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -396,8 +396,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,21,1946,0
- PRODUCTVERSION 3,21,1946,0
+ FILEVERSION 3,21,1947,0
+ PRODUCTVERSION 3,21,1947,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -415,13 +415,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.21.1946"
+            VALUE "FileVersion", "3.21.1947"
             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.21.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.21.1946"
+            VALUE "ProductVersion", "3.21.1947"
         END
     END
     BLOCK "VarFileInfo"