diff --git a/ChangeLog.txt b/ChangeLog.txt
index c4c9356f..f9334595 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,9 +1,11 @@
 o Version 2.16 (2017.07.??)
     Add an audiovisual cue on completion/error
+    Add a workaround for ISOs using nonstantard Rock Ridge extensions (looking at you Kali Linux!)
     Notify user when an ISO is broken or truncated
     Notify user if other processes are accessing the drive before format
     List processes that are locking a drive, if any, on failure
     Improve verbosity of the Windows To Go process
+    Other fixes and improvements
 
 o Version 2.15 (2017.05.17)
     Fix non-listing of drives that are opened for write access by another process
diff --git a/src/net.c b/src/net.c
index 418814ba..1904ef3f 100644
--- a/src/net.c
+++ b/src/net.c
@@ -404,7 +404,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
 {
 	BOOL releases_only, found_new_version = FALSE;
 	int status = 0;
-	const char* server_url = RUFUS_URL "/";
+	const char* server_url = UPDATE_URL "/";
 	int i, j, k, max_channel, verbose = 0, verpos[4];
 	static const char* archname[] = {"win_x86", "win_x64"};
 	static const char* channel[] = {"release", "beta", "test"};		// release channel
diff --git a/src/rufus.h b/src/rufus.h
index bbbae95c..70094dac 100644
--- a/src/rufus.h
+++ b/src/rufus.h
@@ -73,6 +73,7 @@
 #define DD_BUFFER_SIZE              65536		// Minimum size of the buffer we use for DD operations
 #define UBUFFER_SIZE                2048
 #define RUFUS_URL                   "https://rufus.akeo.ie"
+#define UPDATE_URL                  "http://rufus.akeo.ie"	// Stupid XP can't handle a recent SSL implementation...
 #define DOWNLOAD_URL                RUFUS_URL "/downloads"
 #define FILES_URL                   RUFUS_URL "/files"
 #define SEVENZIP_URL                "http://www.7-zip.org"
diff --git a/src/rufus.rc b/src/rufus.rc
index 7425e904..77ea22d8 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.16.1155"
+CAPTION "Rufus 2.16.1156"
 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,16,1155,0
- PRODUCTVERSION 2,16,1155,0
+ FILEVERSION 2,16,1156,0
+ PRODUCTVERSION 2,16,1156,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.16.1155"
+            VALUE "FileVersion", "2.16.1156"
             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.16.1155"
+            VALUE "ProductVersion", "2.16.1156"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdlg.c b/src/stdlg.c
index a96f87f4..d2524bbc 100644
--- a/src/stdlg.c
+++ b/src/stdlg.c
@@ -721,25 +721,23 @@ INT_PTR CALLBACK NotificationCallback(HWND hDlg, UINT message, WPARAM wParam, LP
 
 	switch (message) {
 	case WM_INITDIALOG:
-		// Get the system message box font. See http://stackoverflow.com/a/6057761
-		ncm.cbSize = sizeof(ncm);
-		// If we're compiling with the Vista SDK or later, the NONCLIENTMETRICS struct
-		// will be the wrong size for previous versions, so we need to adjust it.
-		#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
-		if (nWindowsVersion >= WINDOWS_VISTA) {
-			// In versions of Windows prior to Vista, the iPaddedBorderWidth member
-			// is not present, so we need to subtract its size from cbSize.
+		if (nWindowsVersion >= WINDOWS_VISTA) {	// of course, this stuff doesn't work on XP!
+			// Get the system message box font. See http://stackoverflow.com/a/6057761
+			ncm.cbSize = sizeof(ncm);
+			// If we're compiling with the Vista SDK or later, the NONCLIENTMETRICS struct
+			// will be the wrong size for previous versions, so we need to adjust it.
+			#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
 			ncm.cbSize -= sizeof(ncm.iPaddedBorderWidth);
+			#endif
+			SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
+			hDlgFont = CreateFontIndirect(&(ncm.lfMessageFont));
+			// Set the dialog to use the system message box font
+			SendMessage(hDlg, WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
+			SendMessage(GetDlgItem(hDlg, IDC_NOTIFICATION_TEXT), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
+			SendMessage(GetDlgItem(hDlg, IDC_MORE_INFO), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
+			SendMessage(GetDlgItem(hDlg, IDYES), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
+			SendMessage(GetDlgItem(hDlg, IDNO), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
 		}
-		#endif
-		SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
-		hDlgFont = CreateFontIndirect(&(ncm.lfMessageFont));
-		// Set the dialog to use the system message box font
-		SendMessage(hDlg, WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
-		SendMessage(GetDlgItem(hDlg, IDC_NOTIFICATION_TEXT), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
-		SendMessage(GetDlgItem(hDlg, IDC_MORE_INFO), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
-		SendMessage(GetDlgItem(hDlg, IDYES), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
-		SendMessage(GetDlgItem(hDlg, IDNO), WM_SETFONT, (WPARAM)hDlgFont, MAKELPARAM(TRUE, 0));
 
 		apply_localization(IDD_NOTIFICATION, hDlg);
 		background_brush = CreateSolidBrush(GetSysColor(COLOR_WINDOW));