diff --git a/media-libs/openal/openal-1.21.1.recipe b/media-libs/openal/openal-1.21.1.recipe
index d865336ce..4cd51228e 100644
--- a/media-libs/openal/openal-1.21.1.recipe
+++ b/media-libs/openal/openal-1.21.1.recipe
@@ -8,8 +8,8 @@ HOMEPAGE="https://www.openal-soft.org/"
 COPYRIGHT="1999-2000 Loki Software
 	2005-2021 OpenAL Soft team"
 LICENSE="GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz"
+REVISION="5"
+SOURCE_URI="https://github.com/kcat/openal-soft/archive/refs/tags/$portVersion.tar.gz"
 CHECKSUM_SHA256="8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f"
 SOURCE_DIR="openal-soft-$portVersion"
 PATCHES="openal-$portVersion.patchset"
diff --git a/media-libs/openal/patches/openal-1.21.1.patchset b/media-libs/openal/patches/openal-1.21.1.patchset
index 844d64213..6d1255ef8 100644
--- a/media-libs/openal/patches/openal-1.21.1.patchset
+++ b/media-libs/openal/patches/openal-1.21.1.patchset
@@ -1,4 +1,4 @@
-From 453d72b6e17c0cc1400b0e7d4fe27e88cf0a5a9b Mon Sep 17 00:00:00 2001
+From b600c27b3dbeb7664035766a03f4574adefd7e2a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 24 Feb 2021 14:13:58 +1000
 Subject: Add Haiku backend
@@ -566,7 +566,7 @@ index a28204e..c37065c 100644
 2.30.2
 
 
-From 59521430981d3f09f38aa7e7692b2f1504d02cfc Mon Sep 17 00:00:00 2001
+From 4d275ab94a2d3de13f28a496759a8e224b81d596 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 24 Feb 2021 17:06:13 +1000
 Subject: Move config file to settings dir
@@ -668,7 +668,7 @@ index 8e6c7be..5454a3f 100644
 2.30.2
 
 
-From 0e7a1708d56020c66f5d68f580e93762ca4494ba Mon Sep 17 00:00:00 2001
+From 7a3ec72da52e2341a90a8c08a2e7f793a84aa1a5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 24 Feb 2021 18:14:20 +1000
 Subject: Add missing include
@@ -690,7 +690,7 @@ index 0052a64..0159c0e 100644
 2.30.2
 
 
-From 005b08261b2a4dd1dee7ef0e6a96ddaa070586f6 Mon Sep 17 00:00:00 2001
+From 2f213bfd3f3c470ad768fe05453fc900ff49690b Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 27 Feb 2021 23:49:01 +1000
 Subject: Move create/delete BSoundPlayer to play()/stop() funcs
@@ -820,3 +820,96 @@ index 0159c0e..08ebf48 100644
 -- 
 2.30.2
 
+
+From c7c83004d39f8e446f2bbdcd44ea6d65c0e71a96 Mon Sep 17 00:00:00 2001
+From: Anonymous Maarten <madebr@users.noreply.github.com>
+Date: Tue, 6 Jul 2021 09:34:40 +0200
+Subject: Make OpenALConfig.cmake compatible with CMake's FindOpenAL.cmake
+ (#581)
+
+* Make OpenALConfig.cmake compatible with CMake's FindOpenAL.cmake
+
+* Create and install OpenALConfigVersion.cmake
+
+* cmake: drop creating of OpenALConfigVersion.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47280e7..f2c7414 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,7 @@ include(CheckCXXCompilerFlag)
+ include(CheckCSourceCompiles)
+ include(CheckCXXSourceCompiles)
+ include(CheckStructHasMember)
++include(CMakePackageConfigHelpers)
+ include(GNUInstallDirs)
+ 
+ 
+@@ -1255,7 +1256,7 @@ else()
+         target_include_directories(OpenAL
+           PUBLIC
+             $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
+-            $<INSTALL_INTERFACE:include>
++            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+           PRIVATE
+             ${OpenAL_SOURCE_DIR}/common
+             ${OpenAL_BINARY_DIR}
+@@ -1320,7 +1321,10 @@ endif()
+ target_include_directories(${IMPL_TARGET}
+   PUBLIC
+     $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
+-    $<INSTALL_INTERFACE:include>
++  INTERFACE
++    $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include/AL>
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/AL>
+   PRIVATE
+     ${INC_PATHS}
+     ${OpenAL_BINARY_DIR}
+@@ -1387,6 +1391,8 @@ endif()
+ 
+ # Install main library
+ if(ALSOFT_INSTALL)
++    configure_package_config_file(OpenALConfig.cmake.in OpenALConfig.cmake
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenAL)
+     install(TARGETS OpenAL EXPORT OpenAL
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -1395,15 +1401,17 @@ if(ALSOFT_INSTALL)
+         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_INSTALL_INCLUDEDIR}/AL)
+     export(TARGETS OpenAL
+         NAMESPACE OpenAL::
+-        FILE OpenALConfig.cmake)
++        FILE OpenALTargets.cmake)
+     install(EXPORT OpenAL
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenAL
+         NAMESPACE OpenAL::
+-        FILE OpenALConfig.cmake)
++        FILE OpenALTargets.cmake)
+     install(DIRECTORY include/AL
+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+     install(FILES "${OpenAL_BINARY_DIR}/openal.pc"
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++    install(FILES "${OpenAL_BINARY_DIR}/OpenALConfig.cmake"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/OpenAL")
+     if(TARGET soft_oal)
+         install(TARGETS soft_oal
+             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/OpenALConfig.cmake.in b/OpenALConfig.cmake.in
+new file mode 100644
+index 0000000..128c1a4
+--- /dev/null
++++ b/OpenALConfig.cmake.in
+@@ -0,0 +1,9 @@
++cmake_minimum_required(VERSION 3.1)
++
++include("${CMAKE_CURRENT_LIST_DIR}/OpenALTargets.cmake")
++
++set(OPENAL_FOUND ON)
++set(OPENAL_INCLUDE_DIR $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_INCLUDE_DIRECTORIES>)
++set(OPENAL_LIBRARY $<LINK_ONLY:OpenAL::OpenAL>)
++set(OPENAL_DEFINITIONS $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_COMPILE_DEFINITIONS>)
++set(OPENAL_VERSION_STRING @PACKAGE_VERSION@)
+-- 
+2.30.2
+