diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index 071d5d2255ac..e5b3a978acca 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -15,22 +15,17 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
-PLIST_SUB+=	XMLDIR=${XMLDIR}
-PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
-PLIST_SUB+=	CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
+		XMLDIR=${XMLDIR} \
+		CATALOG_PORTS_SGML=${LOCALBASE}/share/sgml/catalog.ports \
+		CATALOG_PORTS_XML=${LOCALBASE}/share/xml/catalog.ports
 
 XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${XMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ent\
-		${FILESDIR}/catalog ${FILESDIR}/catalog.xml ${XMLDIR}
-	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${XMLDIR}/catalog
-	${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${XMLDIR}/catalog.xml
+	${MKDIR} ${STAGEDIR}${XMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ent \
+		${FILESDIR}/catalog ${FILESDIR}/catalog.xml ${STAGEDIR}${XMLDIR}
 
 .include <bsd.port.mk>