diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile
index 5012b48a08a9d..efa8b82fd26dc 100644
--- a/textproc/tinyxml2/Makefile
+++ b/textproc/tinyxml2/Makefile
@@ -1,28 +1,30 @@
 PORTNAME=	tinyxml2
-DISTVERSION=	10.0.0
-PORTREVISION=	2
+PORTVERSION=	10.0.0
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small C++ XML Parser
-WWW=		https://github.com/leethomason/tinyxml2
+WWW=		https://leethomason.github.io/tinyxml2/ \
+		https://github.com/leethomason/tinyxml2
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cmake:testing compiler:c++11-lang cpe dos2unix pathfix
-CPE_VENDOR=	tinyxml2_project
+USES=		compiler:c++11-lang cpe dos2unix meson pathfix
+
+MESON_ARGS=	--default-library=both \
+		-Ddebug=false \
+		-Dtests=true
 USE_LDCONFIG=	yes
 
-USE_GITHUB=     yes
-GH_ACCOUNT=     leethomason
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-CMAKE_TESTING_ON=	tinyxml2_BUILD_TESTING
-PLIST_SUB=	DISTVERSION=${DISTVERSION}
+GH_ACCOUNT=	leethomason
+USE_GITHUB=	yes
 
-CMAKE_OFF=	tinyxml2_BUILD_TESTING
-CMAKE_ON=	BUILD_SHARED_LIBS
+CPE_VENDOR=	tinyxml2_project
 
 OPTIONS_DEFINE=	EXAMPLES
 
@@ -30,4 +32,7 @@ post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
 
+do-test:
+	cd ${WRKSRC}/ && _build/xmltest
+
 .include <bsd.port.mk>
diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist
index c125618084805..d18bc5bb434e8 100644
--- a/textproc/tinyxml2/pkg-plist
+++ b/textproc/tinyxml2/pkg-plist
@@ -1,11 +1,8 @@
 include/tinyxml2.h
-lib/cmake/tinyxml2/tinyxml2-config-version.cmake
-lib/cmake/tinyxml2/tinyxml2-config.cmake
-lib/cmake/tinyxml2/tinyxml2-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/tinyxml2/tinyxml2-shared-targets.cmake
+lib/libtinyxml2.a
 lib/libtinyxml2.so
 lib/libtinyxml2.so.10
-lib/libtinyxml2.so.%%DISTVERSION%%
+lib/libtinyxml2.so.%%PORTVERSION%%
 libdata/pkgconfig/tinyxml2.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml