diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 8feafcd98017..366bb9f46f5e 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,83 +1,76 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 
 PORTNAME=	libxml2
 DISTVERSION=	2.9.10
 PORTREVISION?=	3
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	http://xmlsoft.org/sources/
 DIST_SUBDIR=	gnome2
 
-# CVE-2019-20388, CVE-2020-7595, CVE-2020-24977, Python 3.9 support
-#PATCH_SITES=	https://gitlab.gnome.org/GNOME/libxml2/commit/
-#PATCHFILES=	7ffcd44d7e6c46704f8af0321d9314cd26e0e18a.patch:-p1 \
-#		0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch:-p1 \
-#		50f06b3efb638efb0abd95dc62dca05ae67882c2.patch:-p1 \
-#		edc7b6abb0c125eeb888748c334897f60aab0854.patch:-p1
-
 MAINTAINER?=	desktop@FreeBSD.org
 COMMENT?=	XML parser library for GNOME
 
 LICENSE=	MIT TRIO
 LICENSE_COMB=	multi
 LICENSE_NAME_TRIO=	Trio License
 LICENSE_FILE_MIT=	${WRKSRC}/COPYING
 LICENSE_FILE_TRIO=	${FILESDIR}/LICENSE.TRIO
 LICENSE_PERMS_TRIO=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 USES+=		compiler cpe iconv libtool pathfix pkgconfig shebangfix
 CPE_VENDOR=	xmlsoft
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--without-icu \
 		--with-lzma=/usr \
 		--without-python
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	*.py */*.py */*/*.py
 
 PLIST_SUB+=	LIBVERSION=${PORTVERSION}
 
 .if !defined(MASTERDIR)
 
 OPTIONS_DEFINE=	SCHEMA VALIDATION THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
 OPTIONS_DEFAULT=SCHEMA VALIDATION THREADS
 SCHEMA_DESC=	XML schema support
 SCHEMA_CONFIGURE_WITH=	schemas
 VALIDATION_DESC=	Validation support
 VALIDATION_CONFIGURE_OFF=	--without-valid
 THREADS_DESC=	Threads support
 THREADS_CONFIGURE_WITH=	threads
 MEM_DEBUG_DESC=	Memory debugging (DEVELOPERS ONLY!)
 MEM_DEBUG_CONFIGURE_WITH=	mem-debug
 XMLLINT_HIST_DESC=	History for xmllint
 XMLLINT_HIST_CONFIGURE_WITH=	history
 THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
 THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
 
 .endif # !defined(MASTERDIR)
 
 .if !defined(MASTERDIR)
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .for d in . doc doc/devhelp doc/examples
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
 		${WRKSRC}/${d}/Makefile.in
 .endfor
 .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
 	@${REINPLACE_CMD} -e \
 		's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \
 		 s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \
 		${WRKSRC}/${f}
 .endfor
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	@${REINPLACE_CMD} -e 's/ -Wno-array-bounds//' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5 b/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5
new file mode 100644
index 000000000000..f4b1f8c56d0f
--- /dev/null
+++ b/textproc/libxml2/files/patch-git-106757e8c1e26ad9b8c924c7f304074b79e082c5
@@ -0,0 +1,39 @@
+commit 106757e8c1e26ad9b8c924c7f304074b79e082c5
+Author: Daniel Cheng <dcheng@google.com>
+Date:   Fri Apr 10 14:52:03 2020 -0700
+
+    Guard new calls to xmlValidatePopElement in xml_reader.c
+    
+    Closes #154.
+
+commit 386fb27654b93d9fb2880e03fb508d618a2e66f1
+Author: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
+Date:   Tue Apr 28 17:00:37 2020 +0200
+
+    Add LIBXML_VALID_ENABLED to xmlreader
+    
+    There are already LIBXML_VALID_ENABLED in this file to guard against
+    "--without-valid" at "./configure" step, but here they were missing.
+diff --git xmlreader.c xmlreader.c
+index 687c8b3c..3fd9aa4c 100644
+--- xmlreader.c
++++ xmlreader.c
+@@ -2260,14 +2260,18 @@ xmlFreeTextReader(xmlTextReaderPtr reader) {
+     if (reader->ctxt != NULL) {
+         if (reader->dict == reader->ctxt->dict)
+ 	    reader->dict = NULL;
++#ifdef LIBXML_VALID_ENABLED
+ 	if ((reader->ctxt->vctxt.vstateTab != NULL) &&
+ 	    (reader->ctxt->vctxt.vstateMax > 0)){
++#ifdef LIBXML_REGEXP_ENABLED
+             while (reader->ctxt->vctxt.vstateNr > 0)
+                 xmlValidatePopElement(&reader->ctxt->vctxt, NULL, NULL, NULL);
++#endif /* LIBXML_REGEXP_ENABLED */
+ 	    xmlFree(reader->ctxt->vctxt.vstateTab);
+ 	    reader->ctxt->vctxt.vstateTab = NULL;
+ 	    reader->ctxt->vctxt.vstateMax = 0;
+ 	}
++#endif /* LIBXML_VALID_ENABLED */
+ 	if (reader->ctxt->myDoc != NULL) {
+ 	    if (reader->preserve == 0)
+ 		xmlTextReaderFreeDoc(reader, reader->ctxt->myDoc);