diff --git a/.gitmodules b/.gitmodules
index 197d5f6d3..450c6a6e5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "3rdparty/opus"]
 	path = 3rdparty/opus
-	url = https://gitlab.xiph.org/xiph/opus.git
+	url = https://github.com/mumble-voip/opus.git
 [submodule "3rdparty/minhook"]
 	path = 3rdparty/minhook
 	url = https://github.com/mumble-voip/minhook.git
@@ -25,3 +25,5 @@
 [submodule "3rdparty/gsl"]
 	path = 3rdparty/gsl
 	url = https://github.com/microsoft/GSL.git
+[submodule "opus"]
+	url = https://github.com/mumble-voip/opus.git
diff --git a/3rdparty/opus b/3rdparty/opus
index 6b6035ae4..027cd11ed 160000
--- a/3rdparty/opus
+++ b/3rdparty/opus
@@ -1 +1 @@
-Subproject commit 6b6035ae4a29abbd237463d84a45fbeb0d92bc18
+Subproject commit 027cd11ed732d02456d1f049081d24b4626d5cb9
diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md
index 30a1abd09..6d62dddd9 100644
--- a/docs/dev/build-instructions/cmake_options.md
+++ b/docs/dev/build-instructions/cmake_options.md
@@ -139,6 +139,11 @@ Build a heavily optimized version, specific to the machine it's being compiled o
 (No description available)
 (Default: ON)
 
+### OPUS_BUILD_TESTS
+
+(No description available)
+(Default: OFF)
+
 ### OPUS_STACK_PROTECTOR
 
 (No description available)
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
index 425ba596c..b55b6f512 100644
--- a/src/mumble/CMakeLists.txt
+++ b/src/mumble/CMakeLists.txt
@@ -696,6 +696,7 @@ endif()
 
 if(bundled-opus)
 	option(OPUS_BUILD_SHARED_LIBRARY "" ON)
+	option(OPUS_BUILD_TESTS "" OFF)
 	if(MINGW)
 		option(OPUS_STACK_PROTECTOR "" OFF)
 	endif()