diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure
index 71350badfbe5..9b45948ffc8f 100644
--- a/build/moz.configure/bindgen.configure
+++ b/build/moz.configure/bindgen.configure
@@ -21,7 +21,7 @@ option(env='CBINDGEN', nargs=1, when=cbindgen_is_needed,
 def check_cbindgen_version(cbindgen, fatal=False):
     log.debug("trying cbindgen: %s" % cbindgen)
 
-    cbindgen_min_version = Version('0.13.1')
+    cbindgen_min_version = Version('0.14.1')
 
     # cbindgen x.y.z
     version = Version(check_cmd_output(cbindgen, '--version').strip().split(" ")[1])
diff --git a/gfx/wgpu/wgpu-core/src/device/mod.rs b/gfx/wgpu/wgpu-core/src/device/mod.rs
index 9600146b6f90..d1f516907e07 100644
--- a/gfx/wgpu/wgpu-core/src/device/mod.rs
+++ b/gfx/wgpu/wgpu-core/src/device/mod.rs
@@ -107,7 +107,9 @@ pub(crate) type RenderPassKey = AttachmentData<hal::pass::Attachment>;
 pub(crate) type FramebufferKey = AttachmentData<id::TextureViewId>;
 pub(crate) type RenderPassContext = AttachmentData<TextureFormat>;
 
-type BufferMapResult = Result<*mut u8, hal::device::MapError>;
+// This typedef is needed to work around cbindgen limitations.
+type RawBufferMut = *mut u8;
+type BufferMapResult = Result<RawBufferMut, hal::device::MapError>;
 type BufferMapPendingCallback = (resource::BufferMapOperation, BufferMapResult);
 
 pub type BufferMapReadCallback =
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index 76938db1e863..c13203f6a61b 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -280,12 +280,12 @@ wine-3.0.3:
             sig-url: "{url}.sign"
             key-path: build/unix/build-gcc/DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D.key
 
-cbindgen-0.13.1:
+cbindgen-0.14.1:
     description: cbindgen source code
     fetch:
         type: git
         repo: https://github.com/eqrion/cbindgen
-        revision: 3b97f4ff6b0558cab300c010222caee84245dd5d
+        revision: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002
 
 cctools-port:
     description: cctools-port source code
diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml
index 4448de9a6cdf..678648ac0809 100644
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@@ -14,7 +14,7 @@ job-defaults:
         fetch:
             # If you update this, make sure to update the minimum version in
             # build/moz.configure/bindgen.configure as well.
-            - cbindgen-0.13.1
+            - cbindgen-0.14.1
 
 linux64-cbindgen:
     treeherder: