diff --git a/3rdparty/OpenAL/CMakeLists.txt b/3rdparty/OpenAL/CMakeLists.txt
index 2100de3b4f..f8b7ea13c9 100644
--- a/3rdparty/OpenAL/CMakeLists.txt
+++ b/3rdparty/OpenAL/CMakeLists.txt
@@ -1,13 +1,13 @@
 # OpenAL
 if(USE_SYSTEM_OPENAL)
-	find_package(OpenAL REQUIRED)
-	add_library(3rdparty_openal INTERFACE)
-	target_include_directories(3rdparty_openal INTERFACE ${OPENAL_INCLUDE_DIR})
-	target_link_libraries(3rdparty_openal INTERFACE ${OPENAL_LIBRARY})
+    find_package(OpenAL CONFIG REQUIRED)
+    add_library(3rdparty_openal INTERFACE)
+    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
+    set_target_properties(OpenAL::OpenAL PROPERTIES IMPORTED_GLOBAL ON)
 else()
-	option(ALSOFT_UTILS "Build utility programs" OFF)
-	option(ALSOFT_EXAMPLES "Build example programs" OFF)
-	add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
-	add_library(3rdparty_openal INTERFACE)
-	target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
+    option(ALSOFT_UTILS "Build utility programs" OFF)
+    option(ALSOFT_EXAMPLES "Build example programs" OFF)
+    add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
+    add_library(3rdparty_openal INTERFACE)
+    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
 endif()
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index d73911ff5e..24ec7c35a6 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -143,14 +143,9 @@ elseif(UNIX)
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
 elseif(WIN32)
-    if(MSVC)
-        cmake_policy(SET CMP0026 OLD)
-        get_target_property(OpenAL_LIB_PATH OpenAL::OpenAL LOCATION)
-        if (OpenAL_LIB_PATH)
-            add_custom_command(TARGET rpcs3 POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy ${OpenAL_LIB_PATH} $<TARGET_FILE_DIR:rpcs3>)
-        endif()
-    endif()
+    add_custom_command(TARGET rpcs3 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:OpenAL::OpenAL> $<TARGET_FILE_DIR:rpcs3>
+    )
     add_custom_command(TARGET rpcs3 POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs