diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe
deleted file mode 100644
index fc7ccb0ee..000000000
--- a/dev-perl/xml_parser/xml_parser-2.36.recipe
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY="A perl module for parsing XML documents"
-DESCRIPTION="XML-Parser - A perl module for parsing XML documents."
-HOMEPAGE="http://search.cpan.org/~msergeant/XML-Parser-2.36/"
-COPYRIGHT="1998-2000 Larry Wall and Clark Cooper"
-LICENSE="Artistic"
-REVISION="2"
-SOURCE_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz"
-CHECKSUM_SHA256="9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f"
-SOURCE_DIR="XML-Parser-2.36"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	xml_parser = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libexpat
-	vendor_perl
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libexpat
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:make
-	cmd:perl
-	"
-
-# TODO: Remove hardcoded paths. The following shows how to get the the file path:
-#find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h
-
-BUILD()
-{
-	perl Makefile.PL PREFIX=$prefix
-	sed -i 's/-fstack-protector//g' Expat/Makefile
-	make
-}
-
-INSTALL()
-{
-	make install DESTDIR="${DESTDIR}"
-}
diff --git a/dev-perl/xml_parser/xml_parser-2.44.recipe b/dev-perl/xml_parser/xml_parser-2.47.recipe
similarity index 56%
rename from dev-perl/xml_parser/xml_parser-2.44.recipe
rename to dev-perl/xml_parser/xml_parser-2.47.recipe
index c220cd31a..024e746b5 100644
--- a/dev-perl/xml_parser/xml_parser-2.44.recipe
+++ b/dev-perl/xml_parser/xml_parser-2.47.recipe
@@ -1,32 +1,38 @@
 SUMMARY="A perl module for parsing XML documents"
 DESCRIPTION="XML-Parser - A perl module for parsing XML documents."
-HOMEPAGE="https://metacpan.org/release/TODDR/XML-Parser-2.44"
+HOMEPAGE="https://metacpan.org/pod/XML::Parser"
 COPYRIGHT="1998-2000 Larry Wall and Clark Cooper"
 LICENSE="Artistic"
-REVISION="12"
+REVISION="1"
 SOURCE_URI="https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-$portVersion.tar.gz"
-CHECKSUM_SHA256="1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216"
+CHECKSUM_SHA256="ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8"
 SOURCE_DIR="XML-Parser-$portVersion"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	xml_parser = $portVersion
+	xml_parser$secondaryArchSuffix = $portVersion
 	"
+if [ -n "$secondaryArchSuffix" ]; then
+	PROVIDES+="
+		xml_parser = $portVersion
+		"
+fi
 REQUIRES="
-	haiku
-	lib:libexpat
+	haiku$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
 	vendor_perl
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libexpat
-	cmd:perl
+	haiku${secondaryArchSuffix}_devel
+	devel:libexpat$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:perl
 	"
 
 # TODO: Remove hardcoded paths. The following shows how to get the the file path:
@@ -41,5 +47,10 @@ BUILD()
 
 INSTALL()
 {
-	make install DESTDIR="${DESTDIR}"
+	make pure_install
+}
+
+TEST()
+{
+	make test
 }