diff --git a/.gitignore b/.gitignore
index 649eab0443b..3b26472eff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
 .deps
 .libs
 Makefile
+arm
 x86_32
 x86_64
 autom4te.cache
diff --git a/ChangeLog.txt b/ChangeLog.txt
index bf350a5b273..43d34e82b72 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,10 +1,10 @@
-o Version 2.15 (2017.05.??)
+o Version 2.15 (2017.05.17)
     Fix non-listing of drives that are opened for write access by another process
     Report external processes that may be preventing disk access (in the log)
     Improve Windows To Go support for Windows 10 Creators Update
     Don't report an error on checkdisk failure
     Update GRUB 2.0 and Grub4DOS to latest
-    Additional fixes and improvements
+    Other fixes and improvements
 
 o Version 2.14 (2017.04.10)  [BUGFIX RELEASE]
     Fix inability to create BIOS-bootable drives, in some circumstances, due to write sharing permissions
diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml
index 4326ba9494b..d54cbe6a585 100644
--- a/res/appstore/AppxManifest.xml
+++ b/res/appstore/AppxManifest.xml
@@ -8,7 +8,7 @@
        for an interesting struggle, when you also happen to have a comma in one of the fields... -->
   <Identity
    Name="Rufus"
-   Version="2.15.1113.0"
+   Version="2.15.1117.0"
    ProcessorArchitecture="x86"
    Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET="24, Grey Rock", L=Milford, S=Co Donegal, PostalCode=Co Donegal, C=IE' />
     <Properties>
diff --git a/src/ms-sys/inc/mbr_grub.h b/src/ms-sys/inc/mbr_grub.h
index 61ba86bd041..97ca245b5f1 100644
--- a/src/ms-sys/inc/mbr_grub.h
+++ b/src/ms-sys/inc/mbr_grub.h
@@ -1,5 +1,5 @@
 /*
- * First 423 bytes of MBR from Grub4DOS (Converted from res/grub4dos/grldr.mbr)
+ * First 423 bytes of MBR from Grub4DOS (Converted from res/grub/grldr.mbr)
  */
 unsigned char mbr_grub_0x0[] = {
 	0xEB, 0x5E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/rufus.rc b/src/rufus.rc
index 0e4b0634a43..8a189d3fec1 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.15.1116"
+CAPTION "Rufus 2.15.1117"
 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,15,1116,0
- PRODUCTVERSION 2,15,1116,0
+ FILEVERSION 2,15,1117,0
+ PRODUCTVERSION 2,15,1117,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.15.1116"
+            VALUE "FileVersion", "2.15.1117"
             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.15.1116"
+            VALUE "ProductVersion", "2.15.1117"
         END
     END
     BLOCK "VarFileInfo"