diff --git a/.appveyor.yml b/.appveyor.yml
index 9c4d1faa..5c7d29ae 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,19 +4,23 @@ platform: Any CPU
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.11\msvc2015
+  - QTDIR: C:\Qt\5.14\msvc2017
     PLATFORM: x86
     NSI: gpxsee.nsi
-    OPENSSLDIR: C:\OpenSSL-Win32\bin
-  - QTDIR: C:\Qt\5.11\msvc2015_64
+    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
+    LIBCRYPTO: libssl-1_1.dll
+    LIBSSL: libcrypto-1_1.dll
+  - QTDIR: C:\Qt\5.14\msvc2017_64
     PLATFORM: x86_amd64
     NSI: gpxsee64.nsi
-    OPENSSLDIR: C:\OpenSSL-Win64\bin
+    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
+    LIBCRYPTO: libssl-1_1-x64.dll
+    LIBSSL: libcrypto-1_1-x64.dll    
 install:
 - cmd: >-
     set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
 
-    call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
 build_script:
 - cmd: >-
     lrelease gpxsee.pro
@@ -44,11 +48,11 @@ build_script:
 
     copy licence.txt installer
 
-    copy %OPENSSLDIR%\libeay32.dll installer
+    copy %OPENSSLDIR%\%LIBCRYPTO% installer
 
-    copy %OPENSSLDIR%\ssleay32.dll installer
+    copy %OPENSSLDIR%\%LIBSSL% installer
 
 
     makensis.exe installer\%NSI%
 artifacts:
-- path: installer\GPXSee-*.exe
+- path: installer\GPXSee-*.exe
\ No newline at end of file
diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi
index dd8d5520..da133e6f 100644
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@@ -148,30 +148,28 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
+  DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
   ${If} ${RunningX64}
-    ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
+    ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version"
   ${Else}
     ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
   ${EndIf}
 
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
-  SetOutPath $TEMP
-  File "vcredist_x86.exe"
-  ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart'
-  SetOutPath $INSTDIR
-
-  done:
+  ${If} $R0 >= "v14.24.28127.04"
+    DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
+  ${Else}
+    DetailPrint "Installing Visual C++ 2017 Redistributable..."
+    SetOutPath $TEMP
+    File "vcredist_x86.exe"
+    ExecWait '"$TEMP\vcredist_x86.exe" /install /quiet /norestart'
+    SetOutPath $INSTDIR    
+  ${EndIf}
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
-  File "ssleay32.dll"
+  File "libcrypto-1_1.dll"
+  File "libssl-1_1.dll"
 
 SectionEnd
 
@@ -246,7 +244,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \
diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi
index 694df802..331592e7 100644
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@@ -155,25 +155,23 @@ Section "MSVC runtime" SEC_MSVC
 
   SectionIn RO
 
-  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
-  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
-  StrCmp $R0 "1" 0 +3
-  DetailPrint "Visual C++ 2015 Redistributable is already installed, skipping install."
-  Goto done
-
-  DetailPrint "Installing Visual C++ 2015 Redistributable..."
-  SetOutPath $TEMP
-  File "vcredist_x64.exe"
-  ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart'
-  SetOutPath $INSTDIR
-
-  done:
+  DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
+  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version"
+  ${If} $R0 >= "v14.24.28127.04"
+    DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
+  ${Else}
+    DetailPrint "Installing Visual C++ 2017 runtime..."
+    SetOutPath $TEMP
+    File "vcredist_x64.exe"
+    ExecWait '"$TEMP\vcredist_x64.exe" /install /quiet /norestart'
+    SetOutPath $INSTDIR
+  ${EndIf}
 SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
-  File "libeay32.dll"
-  File "ssleay32.dll"
+  File "libcrypto-1_1-x64.dll"
+  File "libssl-1_1-x64.dll"
 
 SectionEnd
 
@@ -249,7 +247,7 @@ SectionEnd
 LangString DESC_QT ${LANG_ENGLISH} \
   "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
 LangString DESC_OPENSSL ${LANG_ENGLISH} \
   "OpenSSL library. Required for HTTPS to work."
 LangString DESC_ANGLE ${LANG_ENGLISH} \