diff --git a/ChangeLog.txt b/ChangeLog.txt
index 45ab4964..730d9db9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+o Version 2.18 (2017.11.??)
+    Ensure that the same drive is reselected on device refresh
+    Add a cheat mode to cycle the USB port of currently selected device
+    Make lookup for updatable .cfg file more generic (e.g. ESET SysRescue)
+    Fix handling of multiextent ISOs (e.g. BlackArch Linux)
+    Fix propagation of image decompression errors
+
+    IMPORTANT: THIS IS THE LAST RELEASE TO SUPPORT WINDOWS XP AND WINDOWS VITA
+    FUTURE RUFUS RELEASES WILL *NO LONGER* BE COMPATIBILE WITH THESE PLATFORMS
+
 o Version 2.17 (2017.09.12)
     Add support for Debian 9 live ISOs in UEFI mode
     Add support for Super Floppy Disk "partitioning" mode
diff --git a/src/pki.c b/src/pki.c
index 832ad863..ba041abb 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -235,7 +235,10 @@ char* GetSignatureName(const char* path, const char* country_code)
 		goto out;
 	}
 
-	uprintf("Binary executable is signed by '%s' (%s)", szSubjectName, szCountry);
+	if (szCountry[0] == '_')
+		uprintf("Binary executable is signed by '%s'", szSubjectName);
+	else
+		uprintf("Binary executable is signed by '%s' (%s)", szSubjectName, szCountry);
 	p = szSubjectName;
 
 out:
diff --git a/src/rufus.rc b/src/rufus.rc
index b13f55f3..cea60634 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.18.1209"
+CAPTION "Rufus 2.18.1210"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -366,8 +366,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,18,1209,0
- PRODUCTVERSION 2,18,1209,0
+ FILEVERSION 2,18,1210,0
+ PRODUCTVERSION 2,18,1210,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -384,13 +384,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.18.1209"
+            VALUE "FileVersion", "2.18.1210"
             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.18.1209"
+            VALUE "ProductVersion", "2.18.1210"
         END
     END
     BLOCK "VarFileInfo"