diff --git a/sysutils/zot/Makefile b/sysutils/zot/Makefile
index 0384c5b90494..f72bf4f0d7b1 100644
--- a/sysutils/zot/Makefile
+++ b/sysutils/zot/Makefile
@@ -1,49 +1,47 @@
 PORTNAME=	zot
 DISTVERSIONPREFIX=v
-DISTVERSION=	2.1.15
-PORTREVISION=	1
+DISTVERSION=	2.1.16
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/project-zot/zui/releases/download/commit-${ZUI_VERSION}/:ui
 DISTFILES=	zui.tgz:ui
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Production ready and vendor neutral OCI image registry
 WWW=		https://zotregistry.dev/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64
-ONLY_FOR_ARCHS_REASON=	module modernc.org/sqlite only supported on aarch64 and amd64
+BROKEN_i386=	modernc.org/libc does not compile on i386
 
 USES=		go:1.25+,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	project-zot
 
-ZUI_VERSION=	111cb8e
+ZUI_VERSION=	9333420
 
 GO_MODULE=	zotproject.dev/zot
 GO_MOD_DIST=	https://raw.githubusercontent.com/project-zot/zot/refs/tags/v${DISTVERSION}/
 GO_TARGET=	./cmd/zot
 GO_ENV+=	GOEXPERIMENT=jsonv2
 GO_BUILDFLAGS=	-ldflags " \
 		-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=${DISTVERSION} \
 		-X zotregistry.dev/zot/pkg/api/config.BinaryType=full \
 		-X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION}" \
 		-tags sync,search,scrub,metrics,lint,ui,mgmt,profile,userprefs,imagetrust,events,search,mgmt,userprefs
 
 USE_RC_SUBR=	zot
 
 PLIST_FILES=	bin/zot \
 		etc/zot/config-minimal.json.sample \
 		etc/zot/config-ui.json.sample
 
 post-extract:
 	${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/zui.tgz -C ${WRKSRC}/pkg/extensions
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${PATCHDIR}/config-minimal.json ${STAGEDIR}${ETCDIR}/config-minimal.json.sample
 	${INSTALL_DATA} ${PATCHDIR}/config-ui.json ${STAGEDIR}${ETCDIR}/config-ui.json.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/zot/distinfo b/sysutils/zot/distinfo
index 6e64cf93f18e..001589ff2753 100644
--- a/sysutils/zot/distinfo
+++ b/sysutils/zot/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1773070915
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/zui.tgz) = 72e8948bbeb85c7659951d49ae4092be7ae4c7a5ef2afc8780572d0962bf6ba8
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/zui.tgz) = 1091414
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/go.mod) = 3465b0d9b20c7ebba11008e6c96201b3372438ba29cb2aa7f0731b53a014895f
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/go.mod) = 31692
-SHA256 (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/project-zot-zot-v2.1.15_GH0.tar.gz) = 183525bc4ffdf031c6c7e40a013f888f3a1f9a7acc149baa01cd6adc00f59b23
-SIZE (go/sysutils_zot/project-zot-zot-v2.1.15_GH0/project-zot-zot-v2.1.15_GH0.tar.gz) = 1381350
+TIMESTAMP = 1776598200
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/zui.tgz) = b8da52b73c5f5d4c976e6938ca373fac59f78204dd5105412c45f720b3a653b2
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/zui.tgz) = 1092572
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/go.mod) = dc6b0a814f8964613e74627e747edec9af339c5321ff48b5d649d4c63af85743
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/go.mod) = 31147
+SHA256 (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/project-zot-zot-v2.1.16_GH0.tar.gz) = c7ae69cc75fd7186a12ca0eb28ceabff3f8cfab9eb5ff0036160eb4baa51a5b6
+SIZE (go/sysutils_zot/project-zot-zot-v2.1.16_GH0/project-zot-zot-v2.1.16_GH0.tar.gz) = 1412095
diff --git a/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__32bit.go b/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__32bit.go
deleted file mode 100644
index 379ebf587cbb..000000000000
--- a/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__32bit.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3_32bit.go.orig	2025-09-27 12:09:03 UTC
-+++ vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3_32bit.go
-@@ -1,4 +1,4 @@
--//go:build arm
-+//go:build arm || 386
- 
- package s3
- 
diff --git a/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__64bit.go b/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__64bit.go
deleted file mode 100644
index b3a66059aed1..000000000000
--- a/sysutils/zot/files/patch-vendor_github.com_distribution_distribution_v3_registry_storage_driver_s3-aws_s3__64bit.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3_64bit.go.orig	2025-09-27 12:09:03 UTC
-+++ vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3_64bit.go
-@@ -1,4 +1,4 @@
--//go:build !arm
-+//go:build !arm && !386
- 
- package s3
-