--- a/components/libxml2/Makefile	Mon Nov 03 03:01:44 2014 -0800
+++ b/components/libxml2/Makefile	Wed Nov 26 00:57:52 2014 -0800
@@ -48,6 +48,8 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/lint-libraries.mk
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 CFLAGS +=	$(CPP_LARGEFILES)
 LDFLAGS +=	$(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
 

--- a/components/libxml2/libxml2.p5m	Mon Nov 03 03:01:44 2014 -0800
+++ b/components/libxml2/libxml2.p5m	Wed Nov 26 00:57:52 2014 -0800
@@ -39,8 +39,8 @@
 file usr/lib/libxml2.so.2 path=lib/libxml2.so.2
 file $(MACH32)/llib-lxml2.ln path=lib/llib-lxml2.ln
 file path=usr/bin/xml2-config facet.devel=true
-file path=usr/bin/xmlcatalog
-file path=usr/bin/xmllint
+file usr/bin/$(MACH64)/xmlcatalog path=usr/bin/xmlcatalog
+file usr/bin/$(MACH64)/xmllint path=usr/bin/xmllint
 file path=usr/include/libxml2/libxml/DOCBparser.h
 file path=usr/include/libxml2/libxml/HTMLparser.h
 file path=usr/include/libxml2/libxml/HTMLtree.h