diff --git a/docs/labs.md b/docs/labs.md
index bcaec9976a..887ce93d52 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -123,3 +123,10 @@ or feedback for this functionality at this time.
 
 Allows users to receive encrypted messages by creating a device that is stored
 encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
+
+## Voice messages (`feature_voice_messages`) [In Development]
+
+An in-progress implementation of [MSC2516](https://github.com/matrix-org/matrix-doc/pull/2516) to add
+[voice messages](https://github.com/vector-im/element-web/issues/1358) to Element. Note that this feature
+is currently under active development and therefore is entirely incomplete and may not work at all - it
+is not recommended for general use at this time.
diff --git a/webpack.config.js b/webpack.config.js
index 2500792139..2335ea9a03 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -252,6 +252,18 @@ module.exports = (env, argv) => {
                         outputPath: '.',
                     },
                 },
+                {
+                    // Fix up the name of the opus-recorder worker (react-sdk dependency).
+                    // We more or less just want it to be clear it's for opus and not something else.
+                    test: /encoderWorker\.min\.js$/,
+                    loader: "file-loader",
+                    type: "javascript/auto", // https://github.com/webpack/webpack/issues/6725
+                    options: {
+                        // We deliberately override the name so it makes sense in debugging
+                        name: 'opus-encoderWorker.min.[hash:7].[ext]',
+                        outputPath: '.',
+                    },
+                },
                 {
                     // cache-bust languages.json file placed in
                     // element-web/webapp/i18n during build by copy-res.js