diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 2e739bdf12bf..03b3a014f89d 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,116 +1,119 @@
 PORTNAME=	libarchive
-DISTVERSION=	3.5.2
-PORTREVISION=	1
+DISTVERSION=	3.6.0
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://libarchive.org/downloads/
 
+PATCH_SITES=	https://github.com/libarchive/libarchive/commit/
+PATCHFILES=	52efa50c69653029687bfc545703b7340b7a51e2.patch:-p1 \
+		1271f775dc917798ad7d03c3b3bd66bacad03603.patch:-p1
+
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	LZ4 LZO ZSTD
 OPTIONS_DEFAULT=LZ4 ZSTD OPENSSL
 
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	OPENSSL MBEDTLS NETTLE
 
 CRYPTO_DESC=	Crypto and hashing support
 NETTLE_DESC=	Crypto support via Nettle
 
 USES=		cpe iconv libtool localbase:ldflags pathfix tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 CONFIGURE_ARGS=	--disable-static --without-xml2
 
 PLIST_FILES=	bin/bsdcat \
 		bin/bsdcpio \
 		bin/bsdtar \
 		include/archive.h \
 		include/archive_entry.h \
 		lib/libarchive.so \
 		lib/libarchive.so.13 \
 		lib/libarchive.so.1${PORTVERSION} \
 		libdata/pkgconfig/libarchive.pc \
 		man/man1/bsdcat.1.gz \
 		man/man1/bsdcpio.1.gz \
 		man/man1/bsdtar.1.gz \
 		man/man3/archive_entry.3.gz \
 		man/man3/archive_entry_acl.3.gz \
 		man/man3/archive_entry_linkify.3.gz \
 		man/man3/archive_entry_misc.3.gz \
 		man/man3/archive_entry_paths.3.gz \
 		man/man3/archive_entry_perms.3.gz \
 		man/man3/archive_entry_stat.3.gz \
 		man/man3/archive_entry_time.3.gz \
 		man/man3/archive_read.3.gz \
 		man/man3/archive_read_add_passphrase.3.gz \
 		man/man3/archive_read_data.3.gz \
 		man/man3/archive_read_disk.3.gz \
 		man/man3/archive_read_extract.3.gz \
 		man/man3/archive_read_filter.3.gz \
 		man/man3/archive_read_format.3.gz \
 		man/man3/archive_read_free.3.gz \
 		man/man3/archive_read_header.3.gz \
 		man/man3/archive_read_new.3.gz \
 		man/man3/archive_read_open.3.gz \
 		man/man3/archive_read_set_options.3.gz \
 		man/man3/archive_util.3.gz \
 		man/man3/archive_write.3.gz \
 		man/man3/archive_write_blocksize.3.gz \
 		man/man3/archive_write_data.3.gz \
 		man/man3/archive_write_disk.3.gz \
 		man/man3/archive_write_filter.3.gz \
 		man/man3/archive_write_finish_entry.3.gz \
 		man/man3/archive_write_format.3.gz \
 		man/man3/archive_write_free.3.gz \
 		man/man3/archive_write_header.3.gz \
 		man/man3/archive_write_new.3.gz \
 		man/man3/archive_write_open.3.gz \
 		man/man3/archive_write_set_options.3.gz \
 		man/man3/archive_write_set_passphrase.3.gz \
 		man/man3/libarchive.3.gz \
 		man/man3/libarchive_changes.3.gz \
 		man/man3/libarchive_internals.3.gz \
 		man/man5/cpio.5.gz \
 		man/man5/libarchive-formats.5.gz \
 		man/man5/mtree.5.gz \
 		man/man5/tar.5.gz
 
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_WITH=	lzo2
 
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_CONFIGURE_WITH=	lz4
 
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_CONFIGURE_WITH=	zstd
 
 NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NETTLE_CONFIGURE_WITH=	nettle
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_CONFIGURE_OFF=	--without-openssl
 
 MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 MBEDTLS_CONFIGURE_WITH=	mbedtls
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_func_locale_charset=no \
 		ac_cv_lib_charset_locale_charset=no
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo
index 2cf5a46d0fec..1884591a8b53 100644
--- a/archivers/libarchive/distinfo
+++ b/archivers/libarchive/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1636759090
-SHA256 (libarchive-3.5.2.tar.xz) = f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0
-SIZE (libarchive-3.5.2.tar.xz) = 4905416
+TIMESTAMP = 1647154536
+SHA256 (libarchive-3.6.0.tar.xz) = df283917799cb88659a5b33c0a598f04352d61936abcd8a48fe7b64e74950de7
+SIZE (libarchive-3.6.0.tar.xz) = 6400620
+SHA256 (52efa50c69653029687bfc545703b7340b7a51e2.patch) = bb2d7b9d7602bca9f64d792627127c7d2c74e39f488c7125d042e15b265de68c
+SIZE (52efa50c69653029687bfc545703b7340b7a51e2.patch) = 4570
+SHA256 (1271f775dc917798ad7d03c3b3bd66bacad03603.patch) = 75b88af271c5be1d52e732cd72638ecc74f1cf01578eac16b56fc9dfec899976
+SIZE (1271f775dc917798ad7d03c3b3bd66bacad03603.patch) = 1503