diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 078682ce4366..6cdf05391eb6 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -2,25 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	expat
-PORTVERSION=	2.2.8
+PORTVERSION=	2.2.10
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/libexpat/libexpat/releases/download/R_${PORTVERSION:S|.|_|g}/
 
-MAINTAINER=	svysh.fbsd@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML 1.0 parser written in C
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+TEST_DEPENDS=	bash:shells/bash
+
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix tar:bz2
+USES=		libtool pathfix python:test tar:xz
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--without-docbook
+CONFIGURE_ARGS=	--without-docbook --without-examples
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS MANPAGES TEST
+OPTIONS_SUB=	yes
+
+TEST_USES=	shebangfix
+SHEBANG_FILES=	test-driver-wrapper.sh tests/udiffer.py tests/xmltest.sh
+TEST_CONFIGURE_WITH=	tests
+TEST_TARGET=	check
 
-post-install:
+post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/xmlwf.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo
index 88e0d4383495..236e97e3d074 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568632893
-SHA256 (expat-2.2.8.tar.bz2) = 9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102
-SIZE (expat-2.2.8.tar.bz2) = 520377
+TIMESTAMP = 1601788459
+SHA256 (expat-2.2.10.tar.xz) = 5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2
+SIZE (expat-2.2.10.tar.xz) = 425432
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 57f60be8abd4..a3a4fd415039 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -5,8 +5,8 @@ include/expat_external.h
 lib/libexpat.a
 lib/libexpat.so
 lib/libexpat.so.1
-lib/libexpat.so.1.6.10
+lib/libexpat.so.1.6.12
 libdata/pkgconfig/expat.pc
-man/man1/xmlwf.1.gz
+%%MANPAGES%%man/man1/xmlwf.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/changelog