diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 7d78d26c3c..966845bb7d 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -82,7 +82,10 @@ endif()
 # 1913 = VS2017 15.6        / 14.13
 # 1914 = VS2017 15.7        / 14.14
 set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe")
-if(MSVC_VERSION GREATER_EQUAL 1910)
+if(MSVC_VERSION GREATER_EQUAL 1920)
+	set(_ws_vcredist_subdir "vcredist_MSVC2019")
+	set(_msvs_version 15.0) # Doesn't appear to be set
+elseif(MSVC_VERSION GREATER_EQUAL 1910)
 	set(_ws_vcredist_subdir "vcredist_MSVC2017")
 	set(_msvs_version 15.0)
 elseif(MSVC_VERSION GREATER_EQUAL 1900)
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 651432ad44..f261b15b26 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -77,7 +77,9 @@ set (VERSION "${PROJECT_VERSION}")
 set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
 
 # Use the merge module that comes with our version of Visual Studio
-if(MSVC_VERSION GREATER_EQUAL 1910)
+if(MSVC_VERSION GREATER_EQUAL 1920)
+	set (MSVC_CRT_VERSION "VC142")
+elseif(MSVC_VERSION GREATER_EQUAL 1910)
 	set (MSVC_CRT_VERSION "VC141")
 elseif(MSVC_VERSION GREATER_EQUAL 1900)
 	set (MSVC_CRT_VERSION "VC140")