diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index eeba0d39a355..1dd4d5219d6a 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XML-Parser
 PORTVERSION=	2.36
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -49,9 +49,25 @@ post-patch:
 		${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc
 	@${ECHO_CMD} Parser/Encodings/Shift_JIS.enc >> ${WRKSRC}/MANIFEST
 .endif
+	@${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/
+.for e in 1 6 10 11 13 14 15
+	@${ECHO_CMD} Parser/Encodings/iso-8859-${e}.enc >> ${WRKSRC}/MANIFEST
+.endfor
 
 post-configure:
 	@${PERL} -i -pe 's|^(CC = ).*|$$1 ${CC}|;' \
 		-e 's|^(CCFLAGS = ).*|$$1 ${CFLAGS}|' ${WRKSRC}/Expat/Makefile
 
+XE=	${.CURDIR}/../p5-XML-Encoding
+extract-encodings:
+	@cd ${XE}; \
+	${MAKE} patch; \
+	${CHMOD} og+rX `make -VWRKSRC`
+
+build-encodings:
+.for e in 1 6 10 11 13 14 15
+	@cd `cd ${XE}; ${MAKE} -VWRKSRC`; \
+	compile_encoding -o ${FILESDIR}/iso-8859-${e}.enc maps/iso-8859-${e}.xml
+.endfor
+
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Parser/files/iso-8859-1.enc b/textproc/p5-XML-Parser/files/iso-8859-1.enc
new file mode 100644
index 000000000000..f72b82a1b121
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-1.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-10.enc b/textproc/p5-XML-Parser/files/iso-8859-10.enc
new file mode 100644
index 000000000000..43250badb051
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-10.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-11.enc b/textproc/p5-XML-Parser/files/iso-8859-11.enc
new file mode 100644
index 000000000000..8b87ca6ee5ab
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-11.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-13.enc b/textproc/p5-XML-Parser/files/iso-8859-13.enc
new file mode 100644
index 000000000000..0b67c5f3ae00
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-13.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-14.enc b/textproc/p5-XML-Parser/files/iso-8859-14.enc
new file mode 100644
index 000000000000..b0c1171cb1aa
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-14.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-15.enc b/textproc/p5-XML-Parser/files/iso-8859-15.enc
new file mode 100644
index 000000000000..04f6a335ef50
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-15.enc differ
diff --git a/textproc/p5-XML-Parser/files/iso-8859-6.enc b/textproc/p5-XML-Parser/files/iso-8859-6.enc
new file mode 100644
index 000000000000..b0c67fdc675a
Binary files /dev/null and b/textproc/p5-XML-Parser/files/iso-8859-6.enc differ
diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist
index 999e5dbab161..a1092440a30b 100644
--- a/textproc/p5-XML-Parser/pkg-plist
+++ b/textproc/p5-XML-Parser/pkg-plist
@@ -7,13 +7,20 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/big5.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-kr.enc
 %%EUCJP%%%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/euc-jp.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-1.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-2.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-3.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-4.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-5.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-6.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-7.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-10.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-11.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-13.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-14.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/iso-8859-15.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1250.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1252.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/x-euc-jp-jisx0221.enc