--- a/components/libxml2/Makefile	Tue Dec 29 06:34:23 2015 -0800
+++ b/components/libxml2/Makefile	Tue Dec 29 06:48:19 2015 -0800
@@ -48,6 +48,8 @@
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/lint-libraries.mk
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 CFLAGS +=	$(CPP_LARGEFILES)
 LDFLAGS +=	$(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
 
@@ -118,6 +120,8 @@
     (cd $(@D) ; gtar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1));
 
 # common targets
+configure:	$(CONFIGURE_32_and_64)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)

--- a/components/libxml2/libxml2.p5m	Tue Dec 29 06:34:23 2015 -0800
+++ b/components/libxml2/libxml2.p5m	Tue Dec 29 06:48:19 2015 -0800
@@ -40,8 +40,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