diff --git a/extra/eza/.SRCINFO b/extra/eza/.SRCINFO
index f37d499c1..02312b139 100644
--- a/extra/eza/.SRCINFO
+++ b/extra/eza/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eza
 	pkgdesc = A modern replacement for ls (community fork of exa)
 	pkgver = 0.18.20
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/eza-community/eza
 	arch = x86_64
 	license = MIT
@@ -15,8 +15,11 @@ pkgbase = eza
 	conflicts = exa
 	replaces = exa
 	source = https://github.com/eza-community/eza/archive/v0.18.20/eza-0.18.20.tar.gz
+	source = https://github.com/eza-community/eza/commit/30d78ba5.patch
 	sha256sums = f85a7c1a1859e4fb7913d9517bd5fd04714811562b631a71705077c5aceacd78
+	sha256sums = 92f07966466768f2e075539afcd255dca709f7b53a30f49d04d7f1ee44921e3f
 	b2sums = 45f58aec92ca74bc9cfad10898cfa96e3ad1be861473c612ce2b45efb31bd8df33ea7ee8f1daab350b1280931c99b22aa49910c1e5d2413a83114ed9718b213e
+	b2sums = f9f11ea49a0a7bdbaebdd8669e0722803b28281fdeb39dea79ef59bb7b714638c00ae3900e4d9f56fabb12e7a86b3ba928ad46a7fc67274f3992b687cd91dbbb
 
 pkgname = eza
 	depends = gcc-libs
diff --git a/extra/eza/PKGBUILD b/extra/eza/PKGBUILD
index 4c5821ebf..514b71382 100644
--- a/extra/eza/PKGBUILD
+++ b/extra/eza/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=eza
 pkgver=0.18.20
-pkgrel=1
+pkgrel=3
 pkgdesc="A modern replacement for ls (community fork of exa)"
 url="https://github.com/eza-community/eza"
 arch=(x86_64)
@@ -19,18 +19,26 @@ depends=(gcc-libs # libgcc_s.so
          glibc # libc.so libm.so
          libgit2
          zlib)
-makedepends=("cargo")
-source=("$url/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('f85a7c1a1859e4fb7913d9517bd5fd04714811562b631a71705077c5aceacd78')
-b2sums=('45f58aec92ca74bc9cfad10898cfa96e3ad1be861473c612ce2b45efb31bd8df33ea7ee8f1daab350b1280931c99b22aa49910c1e5d2413a83114ed9718b213e')
+makedepends=(cargo)
+source=("$url/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+        "$url/commit/30d78ba5.patch")
+sha256sums=('f85a7c1a1859e4fb7913d9517bd5fd04714811562b631a71705077c5aceacd78'
+            '92f07966466768f2e075539afcd255dca709f7b53a30f49d04d7f1ee44921e3f')
+b2sums=('45f58aec92ca74bc9cfad10898cfa96e3ad1be861473c612ce2b45efb31bd8df33ea7ee8f1daab350b1280931c99b22aa49910c1e5d2413a83114ed9718b213e'
+        'f9f11ea49a0a7bdbaebdd8669e0722803b28281fdeb39dea79ef59bb7b714638c00ae3900e4d9f56fabb12e7a86b3ba928ad46a7fc67274f3992b687cd91dbbb')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+  # Backport ZSH completions fix, see https://github.com/eza-community/eza/issues/1038
+  patch -p1 -i ../30d78ba5.patch
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
+  # Make sure the build fails if our system libgit2 is out
+  # of range rather than silently starting to vendor it.
+  export LIBGIT2_NO_VENDOR=1
   CFLAGS+=' -ffat-lto-objects'
   cargo build --frozen --release
   mkdir -p target/man