diff --git a/Externals/cubeb/CMakeLists.txt b/Externals/cubeb/CMakeLists.txt
index 07f4493dd9..e428d88e01 100644
--- a/Externals/cubeb/CMakeLists.txt
+++ b/Externals/cubeb/CMakeLists.txt
@@ -18,8 +18,9 @@ endif()
 
 if (NOT MSVC)
   set(CMAKE_C_STANDARD 99)
-  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD 17)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 endif()
 
 if(USE_SANITIZERS)
@@ -56,8 +57,8 @@ if(NOT MSVC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -fno-exceptions -fno-rtti")
 else()
-  #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
-  #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable Exceptions
+  #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable RTTI
+  #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable Exceptions
 endif()
 
 add_library(cubeb
@@ -157,6 +158,10 @@ if(LAZY_LOAD_LIBS)
 
   if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
     target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
+
+    if(ANDROID)
+      target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+    endif()
   endif()
 
 else()
@@ -262,7 +267,7 @@ endif()
 check_include_files(SLES/OpenSLES.h USE_OPENSL)
 if(USE_OPENSL)
   target_sources(cubeb PRIVATE
-    cubeb/src/cubeb_opensl.c
+    cubeb/src/cubeb_opensl.cpp
     cubeb/src/cubeb-jni.cpp)
   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
   target_link_libraries(cubeb PRIVATE OpenSLES)
diff --git a/Externals/cubeb/cubeb b/Externals/cubeb/cubeb
index 27d2a102b0..54217bca3f 160000
--- a/Externals/cubeb/cubeb
+++ b/Externals/cubeb/cubeb
@@ -1 +1 @@
-Subproject commit 27d2a102b0b75d9e49d43bc1ea516233fb87d778
+Subproject commit 54217bca3f3e0cd53c073690a23dd25d83557909
diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj
index c35fd82128..9e054bbc3b 100644
--- a/Externals/cubeb/msvc/cubeb.vcxproj
+++ b/Externals/cubeb/msvc/cubeb.vcxproj
@@ -41,6 +41,7 @@
     <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
     <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
     <ClInclude Include="..\cubeb\src\cubeb_tracing.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_triple_buffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />
diff --git a/Externals/cubeb/msvc/cubeb.vcxproj.filters b/Externals/cubeb/msvc/cubeb.vcxproj.filters
index 8611fe88dc..fd366dbb06 100644
--- a/Externals/cubeb/msvc/cubeb.vcxproj.filters
+++ b/Externals/cubeb/msvc/cubeb.vcxproj.filters
@@ -12,6 +12,7 @@
     <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
     <ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_triple_buffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />