--- a/components/gd2/gd2.p5m	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/gd2/gd2.p5m	Wed Mar 30 13:33:31 2016 -0700
@@ -37,21 +37,23 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+# gdlib-config contains embedded paths, so swap these around.
+file usr/bin/gdlib-config path=usr/bin/$(MACH64)/gdlib-config
 #
 #
-file usr/bin/$(MACH64)/annotate path=usr/bin/annotate
-file usr/bin/$(MACH64)/gd2copypal path=usr/bin/gd2copypal
-file usr/bin/$(MACH64)/gd2time path=usr/bin/gd2time
-file usr/bin/$(MACH64)/gd2togif path=usr/bin/gd2togif
-file usr/bin/$(MACH64)/gd2topng path=usr/bin/gd2topng
-file usr/bin/$(MACH64)/gdcmpgif path=usr/bin/gdcmpgif
-file usr/bin/$(MACH64)/gdlib-config path=usr/bin/gdlib-config
-file usr/bin/$(MACH64)/gdparttopng path=usr/bin/gdparttopng
-file usr/bin/$(MACH64)/gdtopng path=usr/bin/gdtopng
-file usr/bin/$(MACH64)/giftogd2 path=usr/bin/giftogd2
-file usr/bin/$(MACH64)/pngtogd path=usr/bin/pngtogd
-file usr/bin/$(MACH64)/pngtogd2 path=usr/bin/pngtogd2
-file usr/bin/$(MACH64)/webpng path=usr/bin/webpng
+file path=usr/bin/annotate
+file path=usr/bin/gd2copypal
+file path=usr/bin/gd2time
+file path=usr/bin/gd2togif
+file path=usr/bin/gd2topng
+file path=usr/bin/gdcmpgif
+file usr/bin/$(MACH32)/gdlib-config path=usr/bin/gdlib-config
+file path=usr/bin/gdparttopng
+file path=usr/bin/gdtopng
+file path=usr/bin/giftogd2
+file path=usr/bin/pngtogd
+file path=usr/bin/pngtogd2
+file path=usr/bin/webpng
 file path=usr/include/gd2/entities.h
 file path=usr/include/gd2/gd.h
 file path=usr/include/gd2/gd_io.h