diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5fd763e31f..7c455e175d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,7 +258,9 @@ if(OPENMP_FOUND)
       set(OPENMP_DLL VCOMP120)
     elseif(MSVC14)
       set(OPENMP_DLL VCOMP140)
-    endif(MSVC90)
+    elseif(MSVC15)
+      set(OPENMP_DLL VCOMP150)
+    endif()
     if(OPENMP_DLL)
       set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DELAYLOAD:${OPENMP_DLL}D.dll")
       set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DELAYLOAD:${OPENMP_DLL}.dll")
diff --git a/cmake/pcl_cpack.cmake b/cmake/pcl_cpack.cmake
index 0e906cd55be..a42d930d2c4 100644
--- a/cmake/pcl_cpack.cmake
+++ b/cmake/pcl_cpack.cmake
@@ -45,6 +45,8 @@ if(WIN32)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2013-${win_system_name}")
   elseif(MSVC14)
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2015-${win_system_name}")
+  elseif(MSVC15)
+    set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-msvc2017-${win_system_name}")
   else()
     set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_PACKAGE_NAME}-${win_system_name}")
   endif()