diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index f464115..df66396 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -38,9 +38,9 @@ TEST_TARGET=	check
 
 SUBST_CLASSES+=		cat
 SUBST_STAGE.cat=	pre-configure
-SUBST_FILES.cat=	catalog.c xmlcatalog.c
-SUBST_SED.cat=	-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
-SUBST_SED.cat+=	-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
+SUBST_FILES.cat=	catalog.c xmlcatalog.c xmllint.c doc/xmllint.1
+SUBST_SED.cat=	-e "s,/etc/sgml/catalog,${SGML_DEFAULT_CATALOG},g"
+SUBST_SED.cat+=	-e "s,/etc/xml/catalog,${XML_DEFAULT_CATALOG},g"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/textproc/libxml2/patches/patch-ac b/textproc/libxml2/patches/patch-ac
deleted file mode 100644
index 4b08f2f..0000000
--- a/textproc/libxml2/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/02/12 16:27:47 recht Exp $
-
---- catalog.c.orig	2005-04-01 15:15:01.000000000 +0200
-+++ catalog.c
-@@ -62,10 +62,10 @@
- #define XML_URN_PUBID "urn:publicid:"
- #define XML_CATAL_BREAK ((xmlChar *) -1)
- #ifndef XML_XML_DEFAULT_CATALOG
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
-+#define XML_XML_DEFAULT_CATALOG "file://@@XML_DEFAULT_CATALOG@@"
- #endif
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "file://@@SGML_DEFAULT_CATALOG@@"
- #endif
- 
- #if defined(_WIN32) && defined(_MSC_VER)
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
deleted file mode 100644
index 8190fca..0000000
--- a/textproc/libxml2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.16 2005/02/12 16:27:47 recht Exp $
-
---- xmlcatalog.c.orig	2005-01-04 15:49:48.000000000 +0100
-+++ xmlcatalog.c
-@@ -43,7 +43,7 @@ static char *filename = NULL;
- 
- 
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "@@SGML_DEFAULT_CATALOG@@"
- #endif
- 
- /************************************************************************