diff -r b8fe51f35344 -r 94c0ca64c022 components/libxml2/libxml2.p5m
--- a/components/libxml2/libxml2.p5m	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/libxml2/libxml2.p5m	Wed Mar 30 13:33:31 2016 -0700
@@ -39,9 +39,11 @@
 link path=lib/libxml2.so target=libxml2.so.2
 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 usr/bin/$(MACH64)/xmlcatalog path=usr/bin/xmlcatalog
-file usr/bin/$(MACH64)/xmllint path=usr/bin/xmllint
+# xml2-config contains embedded paths, so swap these around.
+file usr/bin/xml2-config path=usr/bin/$(MACH64)/xml2-config facet.devel=true
+file usr/bin/$(MACH32)/xml2-config path=usr/bin/xml2-config facet.devel=true
+file path=usr/bin/xmlcatalog
+file 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