diff --git a/ChangeLog.txt b/ChangeLog.txt
index d7698b4b..6a053be7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+o Version 2.12 (2017.01.??)
+    Add Hebrew translation, courtesy of NSBuilder and פלוני אלמוני
+    Add a cheat mode (Alt-O) to create an ISO from the first optical media found
+    Enable target system selection for Windows To Go
+    Enable NTFS selection for Syslinux 6.x (EXPERIMENTAL)
+    Fix an issue that allowed BIOS target selection with pure UEFI images
+    Fix license display for RTL languages
+    Update Grub4DOS and FreeDOS to latest
+    Additional fixes and improvements
+
 o Version 2.11 (2016.09.08)
     Do not download BIOS related files unless BIOS boot is selected
     Improve support for Arch Linux derivatives
diff --git a/res/localization/ChangeLog.txt b/res/localization/ChangeLog.txt
index e41efbac..fe605895 100644
--- a/res/localization/ChangeLog.txt
+++ b/res/localization/ChangeLog.txt
@@ -15,6 +15,28 @@ content. PLEASE, do not just look at this Changelog when updating your
 translation, but always use the English section of rufus.loc as your base.
 For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line!
 
+o Version 1.0.21 (2017.01.16)
+  - *NEW* MSG_288 "Missing elevated privileges"
+  - *NEW* MSG_289 "This application can only run with elevated privileges"
+    This message, along with the previous, is just to notify the user when they have
+    managed to run Rufus in non-elevated mode. This shouldn't happen in most case
+    so this is not something that you can easily test.
+  - *NEW* MSG_290 "File Indexing"
+    This is a cheat mode that can be tested with Alt-Q, that is equivalent to the
+    "Allow files on this drive to have contents indexed in addition to file properties"
+    (i.e. file indexing) option one can see when looking at the drive properties. See:
+    https://rufus.akeo.ie/pics/FileIndexing.png
+  - *NEW* MSG_291 "Version selection"
+  - *NEW* MSG_292 "Please select the version of Windows you want to install:"
+    These two messages are used when the user has the possibility to select between
+    multiple versions of Windows in Windows To Go mode. In this case, a prompt like
+    this will appear, using these 2 messages: https://rufus.akeo.ie/pics/Win2GoVersion.png
+    If you have an official Windows ISO, and the platform you run Rufus on supports
+    Windows To Go (Windows 8 or later *ONLY*), you should be able to test this message.
+  - *NEW* MSG_293 "Unsupported Windows version"
+  - *NEW* MSG_294 "This version of Windows is no longer supported by Rufus."
+    These two messages are not used anywhere yet, but may be needed in a future prompt.
+
 o Version 1.0.20 (2016.05.09)
   - *NEW* MSG_286 "Zeroing drive: %0.1f%% completed"
     Used when filling a whole drive with zero bytes, to display progress in percent (e.g. "Zeroing drive: 12.3% completed")
diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc
index 471082ac..07a69663 100644
--- a/res/localization/rufus.loc
+++ b/res/localization/rufus.loc
@@ -93,7 +93,7 @@
 # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
 # for the LCID (0x####) codes you should use
 l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809
-v 1.0.20
+v 1.0.21
 
 # Main dialog
 g IDD_DIALOG
@@ -555,6 +555,8 @@ t MSG_289 "This application can only run with elevated privileges"
 t MSG_290 "File Indexing"
 t MSG_291 "Version selection"
 t MSG_292 "Please select the version of Windows you want to install:"
+t MSG_293 "Unsupported Windows version"
+t MSG_294 "This version of Windows is no longer supported by Rufus."
 
 ################################################################################
 ############################# TRANSLATOR END COPY ##############################
@@ -5055,7 +5057,7 @@ t MSG_287 "Ei-USB-liitäntäisten irroitettavien asemien tunnistus"
 
 ################################################################################
 l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c
-v 1.0.20
+v 1.0.21
 b "en-US"
 
 g IDD_DIALOG
@@ -5473,6 +5475,13 @@ t MSG_285 "L'exécutable téléchargé est signé par '%s'.\nCe n’est pas une
 	"pourrait indiquer une activité malicieuse...\nÊtes-vous certain de vouloir lancer ce fichier?"
 t MSG_286 "Effacement à zéro : %0.1f%% complété"
 t MSG_287 "Détection disques non-USB détachables"
+t MSG_288 "Privilèges élevés manquants"
+t MSG_289 "Cette application peut seulement être exécutée avec privilèges administratifs"
+t MSG_290 "Indexation de fichiers"
+t MSG_291 "Sélection de version"
+t MSG_292 "Sélectionnez la version de Windows que vous souhaitez installer :"
+t MSG_293 "Version de Windows non supportée"
+t MSG_294 "Cette version de Windows n'est plus supportée par Rufus."
 
 ################################################################################
 l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407
diff --git a/src/rufus.rc b/src/rufus.rc
index fa527bec..540c005d 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.12.1021"
+CAPTION "Rufus 2.12.1022"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,12,1021,0
- PRODUCTVERSION 2,12,1021,0
+ FILEVERSION 2,12,1022,0
+ PRODUCTVERSION 2,12,1022,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.12.1021"
+            VALUE "FileVersion", "2.12.1022"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.12.1021"
+            VALUE "ProductVersion", "2.12.1022"
         END
     END
     BLOCK "VarFileInfo"