diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 671a4e49845d..992bec98315e 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	78.6.0
-PORTREVISION=	2
+DISTVERSION=	78.6.1
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 1c603fb1ac3f..fccc47f6c641 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607779864
-SHA256 (thunderbird-78.6.0.source.tar.xz) = 1dd6f9a4d88b4c3d0ec47bba60a891243ef95e105a9045b2d32e2b126779844b
-SIZE (thunderbird-78.6.0.source.tar.xz) = 353496712
+TIMESTAMP = 1610105147
+SHA256 (thunderbird-78.6.1.source.tar.xz) = 870b544d26f5e52c187499d134e49eded2943a4a029269ae86aba6a69c53dcc6
+SIZE (thunderbird-78.6.1.source.tar.xz) = 351971732
diff --git a/mail/thunderbird/files/patch-bug1684180 b/mail/thunderbird/files/patch-bug1684180
deleted file mode 100644
index 2e375b20f448..000000000000
--- a/mail/thunderbird/files/patch-bug1684180
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 383a82da4808
-Author: Emilio Cobos Álvarez <emilio@crisal.io>
-Date:   Mon Dec 28 04:39:00 2020 -0800
-
-    Bug 1684180 - Fix ESR build with newer versions of cbindgen. r=kvark
----
- dom/webgpu/ipc/WebGPUParent.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git dom/webgpu/ipc/WebGPUParent.cpp dom/webgpu/ipc/WebGPUParent.cpp
-index ff93c0630d02..17c2ace6b4ae 100644
---- dom/webgpu/ipc/WebGPUParent.cpp
-+++ dom/webgpu/ipc/WebGPUParent.cpp
-@@ -423,17 +423,15 @@ ipc::IPCResult WebGPUParent::RecvDeviceCreateBindGroup(
-     switch (entry.mType) {
-       case SerialBindGroupEntryType::Buffer:
-         bgb.resource.tag = ffi::WGPUBindingResource_Buffer;
--        bgb.resource.buffer._0.buffer = entry.mValue;
--        bgb.resource.buffer._0.offset = entry.mBufferOffset;
--        bgb.resource.buffer._0.size = entry.mBufferSize;
-+        bgb.resource.buffer = {entry.mValue, entry.mBufferOffset, entry.mBufferSize};
-         break;
-       case SerialBindGroupEntryType::Texture:
-         bgb.resource.tag = ffi::WGPUBindingResource_TextureView;
--        bgb.resource.texture_view._0 = entry.mValue;
-+        bgb.resource.texture_view = {entry.mValue};
-         break;
-       case SerialBindGroupEntryType::Sampler:
-         bgb.resource.tag = ffi::WGPUBindingResource_Sampler;
--        bgb.resource.sampler._0 = entry.mValue;
-+        bgb.resource.sampler = {entry.mValue};
-         break;
-       default:
-         MOZ_CRASH("unreachable");