diff --git a/_appveyor_mingw.cmd b/_appveyor_mingw.cmd
deleted file mode 100644
index 4241a375..00000000
--- a/_appveyor_mingw.cmd
+++ /dev/null
@@ -1,14 +0,0 @@
-echo on
-SetLocal EnableDelayedExpansion
-
-if [%configuration%] == [Debug] exit 0
-
-set bash=C:\msys64\usr\bin\bash
-set arch=i686
-if [%platform%] == [x86_64] set arch=x86_64
-
-%bash% -e -l -c "mkdir %platform%"
-%bash% -e -l -c ./bootstrap.sh
-%bash% -e -l -c "cd %platform%"
-%bash% -e -l -c "./configure --prefix=/mingw32 --build=%arch%-w64-mingw32 --host=%arch%-w64-mingw32"
-%bash% -e -l -c "make -j4"
diff --git a/_appveyor_msvc.cmd b/_appveyor_msvc.cmd
deleted file mode 100644
index 2dd6e222..00000000
--- a/_appveyor_msvc.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-echo on
-SetLocal EnableDelayedExpansion
-
-msbuild rufus.sln /m /p:Configuration=%configuration%,Platform=%platform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/appveyor.yml b/appveyor.yml
index 169a10b2..d27345fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,16 +1,40 @@
-version: 1.0.{build}
-configuration:
-- Debug
-- Release
-platform:
-- x86_32
-- x86_64
+version: appveyor_build{build}
+
+os: Visual Studio 2015
+
+environment:
+  global:
+    PLATFORMTOOLSET: v140
+    BITS: 32
+  matrix:
+    - CONFIGURATION: Debug
+      COMPILER: MSVC15
+      PLATFORM: x86_32
+    - CONFIGURATION: Debug
+      COMPILER: MSVC15
+      PLATFORM: x86_64
+    - CONFIGURATION: Release
+      COMPILER: MSVC15
+      PLATFORM: x86_32
+    - CONFIGURATION: Release
+      COMPILER: MSVC15
+      PLATFORM: x86_64
+    - CONFIGURATION: Release
+      COMPILER: MinGW
+      PLATFORM: i686
+    - CONFIGURATION: Release
+      COMPILER: MinGW
+      PLATFORM: x86_64
+
 build:
   project: rufus.sln
   parallel: true
   verbosity: detailed
+
 install:
-  - cmd: xcopy /S C:\projects\rufus C:\msys64\home\appveyor\
+- if [%COMPILER%]==[MinGW] xcopy /SQ C:\projects\rufus C:\msys64\home\appveyor\
+- if [%PLATFORM%]==[x86_64] set BITS=64
+
 build_script:
-  - cmd: _appveyor_msvc.cmd
-  - cmd: _appveyor_mingw.cmd
+- if [%COMPILER%]==[MSVC15] msbuild rufus.sln /m /p:Configuration=%CONFIGURATION%,Platform=%PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- if [%COMPILER%]==[MinGW] C:\msys64\usr\bin\bash -lc "export PATH=/mingw%BITS%/bin:$PATH; ./configure --build=%PLATFORM%-w64-mingw32 --host=%PLATFORM%-w64-mingw32 --disable-debug; make -j4"
diff --git a/src/rufus.rc b/src/rufus.rc
index 1d03d03e..6524cc9e 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.10.978"
+CAPTION "Rufus 2.10.979"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,10,978,0
- PRODUCTVERSION 2,10,978,0
+ FILEVERSION 2,10,979,0
+ PRODUCTVERSION 2,10,979,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.10.978"
+            VALUE "FileVersion", "2.10.979"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.10.978"
+            VALUE "ProductVersion", "2.10.979"
         END
     END
     BLOCK "VarFileInfo"