diff --git a/.cargo/config.in b/.cargo/config.in
index d382841a3e87..5e5e5d76a361 100644
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -32,6 +32,11 @@ branch = "rust_1_32"
 git = "https://github.com/hsivonen/packed_simd"
 replace-with = "vendored-sources"
 
+[source."https://github.com/djg/cubeb-pulse-rs"]
+git = "https://github.com/djg/cubeb-pulse-rs"
+replace-with = "vendored-sources"
+rev = "f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df"
+
 [source."https://github.com/bytecodealliance/cranelift"]
 git = "https://github.com/bytecodealliance/cranelift"
 replace-with = "vendored-sources"
diff --git a/Cargo.lock b/Cargo.lock
index c4fe35e32658..5b7c8c5426e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -848,10 +848,11 @@ dependencies = [
 [[package]]
 name = "cubeb-pulse"
 version = "0.3.0"
+source = "git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df#f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df"
 dependencies = [
  "cubeb-backend 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pulse 0.3.0",
- "pulse-ffi 0.1.0",
+ "pulse 0.3.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)",
+ "pulse-ffi 0.1.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)",
  "ringbuf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1456,7 +1457,7 @@ dependencies = [
  "cert_storage 0.0.1",
  "cose-c 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "cubeb-coreaudio 0.1.0 (git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=0920240e4166d2b562840c8062e149d63f7c3a02)",
- "cubeb-pulse 0.3.0",
+ "cubeb-pulse 0.3.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)",
  "cubeb-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding_glue 0.1.0",
  "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2907,14 +2908,16 @@ dependencies = [
 [[package]]
 name = "pulse"
 version = "0.3.0"
+source = "git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df#f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df"
 dependencies = [
  "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pulse-ffi 0.1.0",
+ "pulse-ffi 0.1.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)",
 ]
 
 [[package]]
 name = "pulse-ffi"
 version = "0.1.0"
+source = "git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df#f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df"
 dependencies = [
  "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -4782,6 +4785,7 @@ dependencies = [
 "checksum cubeb-backend 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a1e7add4e7642a8aebb24172922318482bed52389a12cb339f728bbd4c4ed9c"
 "checksum cubeb-core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfd9b2ea1cb6afed9419b0d18fc4093df552ccb2300eb57793629f8cd370b4c8"
 "checksum cubeb-coreaudio 0.1.0 (git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=0920240e4166d2b562840c8062e149d63f7c3a02)" = "<none>"
+"checksum cubeb-pulse 0.3.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)" = "<none>"
 "checksum cubeb-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "309c5839c5fa03c08363bd308566cbe4654b25a9984342d7546a33d55b80a3d6"
 "checksum d3d12 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc7ed48e89905e5e146bcc1951cc3facb9e44aea9adf5dc01078cda1bd24b662"
 "checksum darling 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe629a532efad5526454efb0700f86d5ad7ff001acb37e431c8bf017a432a8e"
@@ -4949,6 +4953,8 @@ dependencies = [
 "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
 "checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
 "checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260"
+"checksum pulse 0.3.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)" = "<none>"
+"checksum pulse-ffi 0.1.0 (git+https://github.com/djg/cubeb-pulse-rs?rev=f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df)" = "<none>"
 "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
diff --git a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA
deleted file mode 100644
index 8c6816a97047..000000000000
--- a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA
+++ /dev/null
@@ -1,8 +0,0 @@
-The source from this directory was copied from the cubeb-pulse-rs
-git repository using the update.sh script.  The only changes
-made were those applied by update.sh and the addition of
-Makefile.in build files for the Mozilla build system.
-
-The cubeb-pulse-rs git repository is: https://github.com/djg/cubeb-pulse-rs.git
-
-The git commit ID used was f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df (2019-10-01 23:32:32 +1300)
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/mixer.rs b/media/libcubeb/cubeb-pulse-rs/src/backend/mixer.rs
deleted file mode 100644
index 727246c507d5..000000000000
--- a/media/libcubeb/cubeb-pulse-rs/src/backend/mixer.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright © 2017-2018 Mozilla Foundation
-//
-// This program is made available under an ISC-style license.  See the
-// accompanying file LICENSE for details.
-
-use cubeb_backend::ffi::*;
-
-static CHANNEL_LAYOUT_UNDEFINED: &'static [cubeb_channel] = &[CHANNEL_INVALID];
-static CHANNEL_LAYOUT_DUAL_MONO: &'static [cubeb_channel] = &[CHANNEL_LEFT, CHANNEL_RIGHT];
-static CHANNEL_LAYOUT_DUAL_MONO_LFE: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_LFE];
-static CHANNEL_LAYOUT_MONO: &'static [cubeb_channel] = &[CHANNEL_MONO];
-static CHANNEL_LAYOUT_MONO_LFE: &'static [cubeb_channel] = &[CHANNEL_MONO, CHANNEL_LFE];
-static CHANNEL_LAYOUT_STEREO: &'static [cubeb_channel] = &[CHANNEL_LEFT, CHANNEL_RIGHT];
-static CHANNEL_LAYOUT_STEREO_LFE: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_LFE];
-static CHANNEL_LAYOUT_3F: &'static [cubeb_channel] = &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_CENTER];
-static CHANNEL_LAYOUT_3FLFE: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_CENTER, CHANNEL_LFE];
-static CHANNEL_LAYOUT_2F1: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_RCENTER];
-static CHANNEL_LAYOUT_2F1LFE: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_LFE, CHANNEL_RCENTER];
-static CHANNEL_LAYOUT_3F1: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_CENTER, CHANNEL_RCENTER];
-static CHANNEL_LAYOUT_3F1LFE: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_CENTER,
-    CHANNEL_LFE,
-    CHANNEL_RCENTER,
-];
-static CHANNEL_LAYOUT_2F2: &'static [cubeb_channel] =
-    &[CHANNEL_LEFT, CHANNEL_RIGHT, CHANNEL_LS, CHANNEL_RS];
-static CHANNEL_LAYOUT_2F2LFE: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_LFE,
-    CHANNEL_LS,
-    CHANNEL_RS,
-];
-static CHANNEL_LAYOUT_3F2: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_CENTER,
-    CHANNEL_LS,
-    CHANNEL_RS,
-];
-static CHANNEL_LAYOUT_3F2LFE: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_CENTER,
-    CHANNEL_LFE,
-    CHANNEL_LS,
-    CHANNEL_RS,
-];
-static CHANNEL_LAYOUT_3F3RLFE: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_CENTER,
-    CHANNEL_LFE,
-    CHANNEL_RCENTER,
-    CHANNEL_LS,
-    CHANNEL_RS,
-];
-static CHANNEL_LAYOUT_3F4LFE: &'static [cubeb_channel] = &[
-    CHANNEL_LEFT,
-    CHANNEL_RIGHT,
-    CHANNEL_CENTER,
-    CHANNEL_LFE,
-    CHANNEL_RLS,
-    CHANNEL_RRS,
-    CHANNEL_LS,
-    CHANNEL_RS,
-];
-
-pub fn channel_index_to_order(layout: cubeb_channel_layout) -> &'static [cubeb_channel] {
-    match layout {
-        CUBEB_LAYOUT_DUAL_MONO => CHANNEL_LAYOUT_DUAL_MONO,
-        CUBEB_LAYOUT_DUAL_MONO_LFE => CHANNEL_LAYOUT_DUAL_MONO_LFE,
-        CUBEB_LAYOUT_MONO => CHANNEL_LAYOUT_MONO,
-        CUBEB_LAYOUT_MONO_LFE => CHANNEL_LAYOUT_MONO_LFE,
-        CUBEB_LAYOUT_STEREO => CHANNEL_LAYOUT_STEREO,
-        CUBEB_LAYOUT_STEREO_LFE => CHANNEL_LAYOUT_STEREO_LFE,
-        CUBEB_LAYOUT_3F => CHANNEL_LAYOUT_3F,
-        CUBEB_LAYOUT_3F_LFE => CHANNEL_LAYOUT_3FLFE,
-        CUBEB_LAYOUT_2F1 => CHANNEL_LAYOUT_2F1,
-        CUBEB_LAYOUT_2F1_LFE => CHANNEL_LAYOUT_2F1LFE,
-        CUBEB_LAYOUT_3F1 => CHANNEL_LAYOUT_3F1,
-        CUBEB_LAYOUT_3F1_LFE => CHANNEL_LAYOUT_3F1LFE,
-        CUBEB_LAYOUT_2F2 => CHANNEL_LAYOUT_2F2,
-        CUBEB_LAYOUT_2F2_LFE => CHANNEL_LAYOUT_2F2LFE,
-        CUBEB_LAYOUT_3F2 => CHANNEL_LAYOUT_3F2,
-        CUBEB_LAYOUT_3F2_LFE => CHANNEL_LAYOUT_3F2LFE,
-        CUBEB_LAYOUT_3F3R_LFE => CHANNEL_LAYOUT_3F3RLFE,
-        CUBEB_LAYOUT_3F4_LFE => CHANNEL_LAYOUT_3F4LFE,
-        _ => CHANNEL_LAYOUT_UNDEFINED,
-    }
-}
diff --git a/media/libcubeb/cubeb-pulse-rs/update.sh b/media/libcubeb/cubeb-pulse-rs/update.sh
deleted file mode 100755
index 2c1761c5f0d7..000000000000
--- a/media/libcubeb/cubeb-pulse-rs/update.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# Usage: sh update.sh <upstream_src_directory>
-set -e
-
-cp -p $1/AUTHORS .
-cp -p $1/LICENSE .
-cp -p $1/README.md .
-cp -p $1/Cargo.toml .
-test -d src || mkdir -p src
-cp -pr $1/src/* src/
-test -d pulse-ffi/src || mkdir -p pulse-ffi/src
-cp -pr $1/pulse-ffi/Cargo.toml pulse-ffi/
-cp -pr $1/pulse-ffi/src/* pulse-ffi/src/
-test -d pulse-rs/src || mkdir -p pulse-rs/src
-cp -pr $1/pulse-rs/Cargo.toml pulse-rs/
-cp -pr $1/pulse-rs/src/* pulse-rs/src/
-
-if [ -d $1/.git ]; then
-  rev=$(cd $1 && git rev-parse --verify HEAD)
-  date=$(cd $1 && git show -s --format=%ci HEAD)
-  dirty=$(cd $1 && git diff-index --name-only HEAD)
-fi
-
-if [ -n "$rev" ]; then
-  version=$rev
-  if [ -n "$dirty" ]; then
-    version=$version-dirty
-    echo "WARNING: updating from a dirty git repository."
-  fi
-  sed -i.bak -e "/The git commit ID used was/ s/[0-9a-f]\{40\}\(-dirty\)\{0,1\} .\{1,100\}/$version ($date)/" README_MOZILLA
-  rm README_MOZILLA.bak
-else
-  echo "Remember to update README_MOZILLA with the version details."
-fi
diff --git a/third_party/rust/cubeb-pulse/.cargo-checksum.json b/third_party/rust/cubeb-pulse/.cargo-checksum.json
new file mode 100644
index 000000000000..d01523d03a68
--- /dev/null
+++ b/third_party/rust/cubeb-pulse/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{".editorconfig":"bf047bd1da10cabb99eea666d1e57c321eba4716dccb3e4ed0e2c5fe3ca53858",".travis.yml":"0394e2adb041175457685cde5ee05ff04bdab8885fd8a62551f2ff43d9e48872","AUTHORS":"0e0ac930a68ce2f6b876126b195add177f0d3886facb9260f4d9b69f1988f0cc","Cargo.toml":"e35841abe5d1118d3f2b4bd13d31adabea04d386080d983d5ea0dc3daf8d58bf","LICENSE":"44c6b5ae5ec3fe2fbc608b00e6f4896f4d2d5c7e525fcbaa3eaa3cf2f3d5a983","README.md":"e6a98ee5630b9ce1a096a2907d095454f2770e298a5b0976ab552cc53ca96cfc","src/backend/context.rs":"33d9fdf1504fe1ae43d301e288daf6eaeabeb47aa0ef86efa135c6d984425fc4","src/backend/cork_state.rs":"4a0f1afc7d9f333dac89218cc56d7d32fbffb487cd48c1c9a4e03d79cb3b5e28","src/backend/intern.rs":"374a9a3bd79fddc47739dda1dbfc5929aea5a91946794fe65fba3c8d130fbda9","src/backend/mod.rs":"06ce9250865abf0ea461f215b128470636d072a6776821efef3caf5a7b992fb9","src/backend/stream.rs":"201b0f22a78bae9741a6a196cd40a92108dfef365e009d39cc9d9e1d63fbe74a","src/capi.rs":"b2c1be8128cadd36caa65c80950440f9d6f2aa0c24cc7bae6a9eaf6347ac454d","src/lib.rs":"7282560d84b134b09acfd8d6282600982e42fb3557f72454c535637cc26c7bf6"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/cubeb-pulse/.editorconfig b/third_party/rust/cubeb-pulse/.editorconfig
new file mode 100644
index 000000000000..d1f040a232f3
--- /dev/null
+++ b/third_party/rust/cubeb-pulse/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/third_party/rust/cubeb-pulse/.travis.yml b/third_party/rust/cubeb-pulse/.travis.yml
new file mode 100644
index 000000000000..e1f5524c3e48
--- /dev/null
+++ b/third_party/rust/cubeb-pulse/.travis.yml
@@ -0,0 +1,70 @@
+language: rust
+cache: cargo
+notifications:
+  email:
+    on_success: never
+
+rust:
+# Version 1.36 is the minimum version of rust supported by Gecko.
+- 1.36.0
+- stable
+- nightly
+
+env:
+# default jobs with and without optional features.
+-
+- FEATURES=pulse-dlopen
+
+# Invoke cargo with optional target or features switches.
+script: >
+  cargo test
+  ${TARGET:+--target ${TARGET}}
+  ${FEATURES:+--features ${FEATURES}}
+
+# Install cross target if necessary.
+before_install:
+  if test -n "${TARGET}"; then rustup target add ${TARGET}; fi
+
+addons: &apt_64
+  apt:
+    packages:
+    - libpulse-dev
+
+matrix:
+  include:
+  # Add in 32-bit builds
+  - rust: 1.36.0
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    addons: &apt_32
+      apt:
+        packages:
+        - gcc-multilib
+        - g++-multilib
+        - libpulse-dev:i386
+        - libglib2.0-dev:i386
+  - rust: 1.36.0
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    - FEATURES=pulse-dlopen
+    addons: *apt_32
+  - rust: stable
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    addons: *apt_32
+  - rust: stable
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    - FEATURES=pulse-dlopen
+    addons: *apt_32
+  - rust: nightly
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    addons: *apt_32
+  - rust: nightly
+    env:
+    - TARGET=i686-unknown-linux-gnu
+    - FEATURES=pulse-dlopen
+    addons: *apt_32
+  allow_failures:
+  - rust: nightly
diff --git a/media/libcubeb/cubeb-pulse-rs/AUTHORS b/third_party/rust/cubeb-pulse/AUTHORS
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/AUTHORS
rename to third_party/rust/cubeb-pulse/AUTHORS
diff --git a/media/libcubeb/cubeb-pulse-rs/Cargo.toml b/third_party/rust/cubeb-pulse/Cargo.toml
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/Cargo.toml
rename to third_party/rust/cubeb-pulse/Cargo.toml
diff --git a/media/libcubeb/cubeb-pulse-rs/LICENSE b/third_party/rust/cubeb-pulse/LICENSE
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/LICENSE
rename to third_party/rust/cubeb-pulse/LICENSE
diff --git a/media/libcubeb/cubeb-pulse-rs/README.md b/third_party/rust/cubeb-pulse/README.md
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/README.md
rename to third_party/rust/cubeb-pulse/README.md
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs b/third_party/rust/cubeb-pulse/src/backend/context.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/backend/context.rs
rename to third_party/rust/cubeb-pulse/src/backend/context.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/cork_state.rs b/third_party/rust/cubeb-pulse/src/backend/cork_state.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/backend/cork_state.rs
rename to third_party/rust/cubeb-pulse/src/backend/cork_state.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/intern.rs b/third_party/rust/cubeb-pulse/src/backend/intern.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/backend/intern.rs
rename to third_party/rust/cubeb-pulse/src/backend/intern.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/mod.rs b/third_party/rust/cubeb-pulse/src/backend/mod.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/backend/mod.rs
rename to third_party/rust/cubeb-pulse/src/backend/mod.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs b/third_party/rust/cubeb-pulse/src/backend/stream.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs
rename to third_party/rust/cubeb-pulse/src/backend/stream.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/capi.rs b/third_party/rust/cubeb-pulse/src/capi.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/capi.rs
rename to third_party/rust/cubeb-pulse/src/capi.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/src/lib.rs b/third_party/rust/cubeb-pulse/src/lib.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/src/lib.rs
rename to third_party/rust/cubeb-pulse/src/lib.rs
diff --git a/third_party/rust/pulse-ffi/.cargo-checksum.json b/third_party/rust/pulse-ffi/.cargo-checksum.json
new file mode 100644
index 000000000000..ba5f0af88f21
--- /dev/null
+++ b/third_party/rust/pulse-ffi/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"d4c2d2074582372a94e3e6ad7f11c99784e90ecd7723327ac349c2b1054cd2ec","src/ffi_funcs.rs":"0aae9bb21ead31098b38a2f64a0366b9e8b129dd250b5780deae9deb1a8a1499","src/ffi_types.rs":"fd6ca280be7601ae1990d4d0626fa9c4c6c9c958040c29e651764d06386d15c1","src/lib.rs":"edb03c6d9bcddc69a688160ffda0b8bdb69f1f87ccbc3e3b005574c9d5484991"},"package":null}
\ No newline at end of file
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-ffi/Cargo.toml b/third_party/rust/pulse-ffi/Cargo.toml
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-ffi/Cargo.toml
rename to third_party/rust/pulse-ffi/Cargo.toml
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs b/third_party/rust/pulse-ffi/src/ffi_funcs.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/ffi_funcs.rs
rename to third_party/rust/pulse-ffi/src/ffi_funcs.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs b/third_party/rust/pulse-ffi/src/ffi_types.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/ffi_types.rs
rename to third_party/rust/pulse-ffi/src/ffi_types.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/lib.rs b/third_party/rust/pulse-ffi/src/lib.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-ffi/src/lib.rs
rename to third_party/rust/pulse-ffi/src/lib.rs
diff --git a/third_party/rust/pulse/.cargo-checksum.json b/third_party/rust/pulse/.cargo-checksum.json
new file mode 100644
index 000000000000..3f8bc60d21e3
--- /dev/null
+++ b/third_party/rust/pulse/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"c1f3e23d61a434a65e8e11561ba39b8ad90d1c8909fac3d53ec26f14bfe3f523","src/context.rs":"5e43131c0a989336e149b5408e0b362c0ef8176854785f98191f86b75ef5d76a","src/error.rs":"7be0ad689b6519a5be3771c29a102ff394bdc5ee46502d418bced90268e912dd","src/lib.rs":"8636d18c55b7ccd8e79d45a8d12ea84ba94b7aeef8ac3975292c94a28ed4a2b1","src/mainloop_api.rs":"b4a6c7e1a507490157c5b4a25af367cf810e1ef64c7a96f71575a15674d9b649","src/operation.rs":"c0d3e28ef7db52d60b19f931fe7bb44271127009b2e82693da2b7e342e804022","src/proplist.rs":"65bfc2b90f31bc3969aef69eb3e26b34ac657a2149f1b6515791403d752f3fc5","src/stream.rs":"577301501d9ef0452379b82bcbf39b8d511d7091cfb8c8cbb3626a8c9a487aad","src/threaded_mainloop.rs":"958181a46363ded3ac8e0d9c9d912587cb6f9f26ae6f190881014adbda2d3211","src/util.rs":"d971486fd828b8b9d81db61a21a77960ea34a99a59b96fceaf77c2b84ed2accc"},"package":null}
\ No newline at end of file
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/Cargo.toml b/third_party/rust/pulse/Cargo.toml
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/Cargo.toml
rename to third_party/rust/pulse/Cargo.toml
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs b/third_party/rust/pulse/src/context.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs
rename to third_party/rust/pulse/src/context.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/error.rs b/third_party/rust/pulse/src/error.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/error.rs
rename to third_party/rust/pulse/src/error.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs b/third_party/rust/pulse/src/lib.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs
rename to third_party/rust/pulse/src/lib.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs b/third_party/rust/pulse/src/mainloop_api.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/mainloop_api.rs
rename to third_party/rust/pulse/src/mainloop_api.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/operation.rs b/third_party/rust/pulse/src/operation.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/operation.rs
rename to third_party/rust/pulse/src/operation.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/proplist.rs b/third_party/rust/pulse/src/proplist.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/proplist.rs
rename to third_party/rust/pulse/src/proplist.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs b/third_party/rust/pulse/src/stream.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs
rename to third_party/rust/pulse/src/stream.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs b/third_party/rust/pulse/src/threaded_mainloop.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/threaded_mainloop.rs
rename to third_party/rust/pulse/src/threaded_mainloop.rs
diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/util.rs b/third_party/rust/pulse/src/util.rs
similarity index 100%
rename from media/libcubeb/cubeb-pulse-rs/pulse-rs/src/util.rs
rename to third_party/rust/pulse/src/util.rs
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index 2b5a3d9c6492..720cef95c196 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -20,7 +20,7 @@ profiler_helper = { path = "../../../../tools/profiler/rust-helper", optional =
 mozurl = { path = "../../../../netwerk/base/mozurl" }
 webrender_bindings = { path = "../../../../gfx/webrender_bindings", optional = true }
 cubeb-coreaudio = { git = "https://github.com/ChunMinChang/cubeb-coreaudio-rs", rev = "0920240e4166d2b562840c8062e149d63f7c3a02", optional = true }
-cubeb-pulse = { path = "../../../../media/libcubeb/cubeb-pulse-rs", optional = true, features=["pulse-dlopen"] }
+cubeb-pulse = { git = "https://github.com/djg/cubeb-pulse-rs", rev="f9eb50b87328b5ebdc4a310f9e0f445ee89aa9df", optional = true, features=["pulse-dlopen"] }
 cubeb-sys = { version = "0.6", optional = true, features=["gecko-in-tree"] }
 encoding_glue = { path = "../../../../intl/encoding_glue" }
 audioipc-client = { path = "../../../../media/audioipc/client", optional = true }