diff --git a/CMakeLists.txt b/CMakeLists.txt
index c85210052..5d3d1250a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,15 +287,19 @@ if(SFML_OS_WINDOWS)
     # install the binaries of SFML dependencies
     if(ARCH_32BITS)
         install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
-        if(SFML_COMPILER_MSVC)
+        if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
             install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
+        elseif(SFML_COMPILER_MSVC)
+            install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
         else()
             install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
         endif()
     elseif(ARCH_64BITS)
         install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
-        if(SFML_COMPILER_MSVC)
+        if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
             install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
+        elseif(SFML_COMPILER_MSVC)
+            install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
         else()
             install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
         endif()
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
index 08c83ef9a..85fb8fea2 100644
--- a/cmake/Config.cmake
+++ b/cmake/Config.cmake
@@ -101,6 +101,8 @@ elseif(MSVC)
         set(SFML_MSVC_VERSION 11)
     elseif(MSVC_VERSION EQUAL 1800)
         set(SFML_MSVC_VERSION 12)
+    elseif(MSVC_VERSION EQUAL 1900)
+        set(SFML_MSVC_VERSION 14)
     endif()
 else()
     message(FATAL_ERROR "Unsupported compiler")
diff --git a/extlibs/libs-msvc-universal/x64/flac.lib b/extlibs/libs-msvc-universal/x64/flac.lib
new file mode 100644
index 000000000..77a72f555
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/flac.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/freetype.lib b/extlibs/libs-msvc-universal/x64/freetype.lib
new file mode 100644
index 000000000..3bca01ca5
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/freetype.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/jpeg.lib b/extlibs/libs-msvc-universal/x64/jpeg.lib
new file mode 100644
index 000000000..91d324213
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/jpeg.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/ogg.lib b/extlibs/libs-msvc-universal/x64/ogg.lib
new file mode 100644
index 000000000..9b260e5a9
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/ogg.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/openal32.lib b/extlibs/libs-msvc-universal/x64/openal32.lib
new file mode 100644
index 000000000..b030b3294
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/openal32.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/vorbis.lib b/extlibs/libs-msvc-universal/x64/vorbis.lib
new file mode 100644
index 000000000..daee345e3
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/vorbis.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/vorbisenc.lib b/extlibs/libs-msvc-universal/x64/vorbisenc.lib
new file mode 100644
index 000000000..2d4d6de29
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/vorbisenc.lib differ
diff --git a/extlibs/libs-msvc-universal/x64/vorbisfile.lib b/extlibs/libs-msvc-universal/x64/vorbisfile.lib
new file mode 100644
index 000000000..82f79de1d
Binary files /dev/null and b/extlibs/libs-msvc-universal/x64/vorbisfile.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/flac.lib b/extlibs/libs-msvc-universal/x86/flac.lib
new file mode 100644
index 000000000..fd29aca3f
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/flac.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/freetype.lib b/extlibs/libs-msvc-universal/x86/freetype.lib
new file mode 100644
index 000000000..6e57b1eb7
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/freetype.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/jpeg.lib b/extlibs/libs-msvc-universal/x86/jpeg.lib
new file mode 100644
index 000000000..04c812958
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/jpeg.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/ogg.lib b/extlibs/libs-msvc-universal/x86/ogg.lib
new file mode 100644
index 000000000..39b2f9230
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/ogg.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/openal32.lib b/extlibs/libs-msvc-universal/x86/openal32.lib
new file mode 100644
index 000000000..e466abd1b
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/openal32.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/vorbis.lib b/extlibs/libs-msvc-universal/x86/vorbis.lib
new file mode 100644
index 000000000..754a65f30
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/vorbis.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/vorbisenc.lib b/extlibs/libs-msvc-universal/x86/vorbisenc.lib
new file mode 100644
index 000000000..02446e43e
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/vorbisenc.lib differ
diff --git a/extlibs/libs-msvc-universal/x86/vorbisfile.lib b/extlibs/libs-msvc-universal/x86/vorbisfile.lib
new file mode 100644
index 000000000..8cce75de4
Binary files /dev/null and b/extlibs/libs-msvc-universal/x86/vorbisfile.lib differ
diff --git a/src/SFML/CMakeLists.txt b/src/SFML/CMakeLists.txt
index 392ed8231..8eb334d95 100644
--- a/src/SFML/CMakeLists.txt
+++ b/src/SFML/CMakeLists.txt
@@ -14,10 +14,18 @@ if (SFML_OS_WINDOWS)
             set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x64")
         endif()
     elseif(SFML_COMPILER_MSVC)
-        if(ARCH_32BITS)
-            set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x86")
-        elseif(ARCH_64BITS)
-            set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x64")
+        if(SFML_MSVC_VERSION LESS 14)
+            if(ARCH_32BITS)
+                set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x86")
+            elseif(ARCH_64BITS)
+                set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x64")
+            endif()
+        else()
+            if(ARCH_32BITS)
+                set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc-universal/x86")
+            elseif(ARCH_64BITS)
+                set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc-universal/x64")
+            endif()
         endif()
     endif()
 elseif(SFML_OS_MACOSX)