diff --git a/www/tidy-html5/Makefile b/www/tidy-html5/Makefile
index ffc9f8bb2da9..161a8179b798 100644
--- a/www/tidy-html5/Makefile
+++ b/www/tidy-html5/Makefile
@@ -1,31 +1,32 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	tidy-html5
-PORTVERSION=	5.7.28
+PORTVERSION=	5.8.0
 CATEGORIES=	www
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Tidy tidies HTML and XML documents
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README/LICENSE.md
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	htacg
 
 USES=		cmake gnome
 USE_GNOME=	libxslt
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIB:BOOL=ON	\
 		-DTIDY_CONSOLE_SHARED:BOOL=ON
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 post-install:
 	# To avoid conflict ATM - to be removed later
 	${MV} ${STAGEDIR}${PREFIX}/bin/tidy ${STAGEDIR}${PREFIX}/bin/tidy5
+	${MV} ${STAGEDIR}${PREFIX}/lib/libtidy.a ${STAGEDIR}${PREFIX}/lib/libtidys.a
 	${MV} ${STAGEDIR}${PREFIX}/lib/libtidy.so ${STAGEDIR}${PREFIX}/lib/libtidy5.so
 	${MV} ${STAGEDIR}${MANPREFIX}/man/man1/tidy.1 ${STAGEDIR}${MANPREFIX}/man/man1/tidy5.1
 
 .include <bsd.port.mk>
diff --git a/www/tidy-html5/distinfo b/www/tidy-html5/distinfo
index 75e41020a2aa..62add19091fe 100644
--- a/www/tidy-html5/distinfo
+++ b/www/tidy-html5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562693725
-SHA256 (htacg-tidy-html5-5.7.28_GH0.tar.gz) = 5caa2c769204f506e24ea4986a45abe23f71d14f0fe968314f20065f342ffdba
-SIZE (htacg-tidy-html5-5.7.28_GH0.tar.gz) = 670474
+TIMESTAMP = 1626724862
+SHA256 (htacg-tidy-html5-5.8.0_GH0.tar.gz) = 59c86d5b2e452f63c5cdb29c866a12a4c55b1741d7025cf2f3ce0cde99b0660e
+SIZE (htacg-tidy-html5-5.8.0_GH0.tar.gz) = 1015303
diff --git a/www/tidy-html5/pkg-plist b/www/tidy-html5/pkg-plist
index ec0bb0eaa6bb..107ec5a77000 100644
--- a/www/tidy-html5/pkg-plist
+++ b/www/tidy-html5/pkg-plist
@@ -1,11 +1,11 @@
 bin/tidy5
 include/tidy.h
 include/tidybuffio.h
 include/tidyenum.h
 include/tidyplatform.h
-lib/libtidy.so.5
+lib/libtidy.so.58
 lib/libtidy.so.%%VER%%
 lib/libtidy5.so
 lib/libtidys.a
 libdata/pkgconfig/tidy.pc
 man/man1/tidy5.1.gz