diff --git a/community/fwupd/PKGBUILD b/community/fwupd/PKGBUILD
index b14379f90..eeb50d013 100644
--- a/community/fwupd/PKGBUILD
+++ b/community/fwupd/PKGBUILD
@@ -9,18 +9,18 @@
 
 pkgname=fwupd
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple daemon to allow session software to update firmware"
 arch=(x86_64)
 url="https://github.com/fwupd/fwupd"
 license=(LGPL)
 depends=(libxmlb python libgusb
          libsoup json-glib gcab libarchive gpgme
-         libgudev polkit shared-mime-info modemmanager
-         tpm2-tss)
+         libgudev polkit shared-mime-info modemmanager)
+optdepends=('tpm2-tss: UEFI plugin')
 makedepends=(meson gobject-introspection gtk-doc
              python-cairo noto-fonts noto-fonts-cjk python-gobject vala
-             bash-completion python-pillow help2man)
+             bash-completion python-pillow help2man tpm2-tss)
 checkdepends=(umockdev)
 backup=('etc/fwupd/daemon.conf'
         'etc/fwupd/redfish.conf'
@@ -31,8 +31,11 @@ backup=('etc/fwupd/daemon.conf'
         'etc/fwupd/remotes.d/vendor-directory.conf'
         'etc/fwupd/remotes.d/vendor.conf'
         'etc/fwupd/uefi.conf')
-source=("https://people.freedesktop.org/~hughsient/releases/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('6fcb6773a2e1fe12bd7aa86aebcfd2cb6a877f7400590abaad8347cc881f7aa0' 'SKIP')
+source=("https://people.freedesktop.org/~hughsient/releases/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        "fix-tpm2-abrmd.patch::${url}/commit/8b98b1cbd9d96479510faca3aed5bfdeff16066b.patch")
+sha256sums=('6fcb6773a2e1fe12bd7aa86aebcfd2cb6a877f7400590abaad8347cc881f7aa0'
+            'SKIP'
+            'd5c333757abede95fbb3e67e70718c59a3d011e39da86b8bc67eceb921af660b')
 validpgpkeys=(163EB50119225DB3DF8F49EA17ACBA8DFA970E17) # Richard Hughes <richard@hughsie.com>
 
 prepare() {
@@ -41,6 +44,9 @@ prepare() {
   # This tests are failing inside a chroot
   sed -i "/test('uefi-self-test', e)/d" plugins/uefi/meson.build
   sed -i "/test('dell-self-test', e)/d" plugins/dell/meson.build
+
+  # Fix crashing on tpm2-abrmd debug messages
+  patch -p1 < ../fix-tpm2-abrmd.patch
 }
 
 build() {