diff --git a/libarchive/trunk/PKGBUILD b/libarchive/trunk/PKGBUILD
index e0b6fe70..6e0856b3 100644
--- a/libarchive/trunk/PKGBUILD
+++ b/libarchive/trunk/PKGBUILD
@@ -3,18 +3,29 @@
 
 pkgname=libarchive
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Multi-format archive and compression library'
 arch=('x86_64')
 url='https://libarchive.org/'
 license=('BSD')
 depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
+makedepends=('git')
 provides=('libarchive.so')
 options=('debug')
 validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E') # Martin Matuska <mm@FreeBSD.org>
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+         https://github.com/libarchive/libarchive/commit/fd180c3603.patch
+         https://github.com/libarchive/libarchive/commit/fc8c6d2786.patch)
 sha256sums=('5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6'
-            'SKIP')
+            'SKIP'
+            '4f93c5a102cce1fc672d59888471017b545704bfa9d762c630e84b28215162e7'
+            'e33a6f005cd11e84ff5de91d2134738f7373bc3ce310dd0ef9b8bd7d50f75d30')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  git apply ../fd180c3603.patch
+  git apply --include=archive_read_support_format_tar.c ../fc8c6d2786.patch
+}
 
 build() {
   cd "${pkgname}-${pkgver}"