--- a/components/libgcrypt/libgcrypt.p5m	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/libgcrypt/libgcrypt.p5m	Wed Mar 30 13:33:31 2016 -0700
@@ -36,10 +36,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/422
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/$(MACH64)/libgcrypt-config
-file usr/bin/$(MACH64)/dumpsexp path=usr/bin/dumpsexp
-file usr/bin/$(MACH64)/hmac256 path=usr/bin/hmac256
-file path=usr/bin/libgcrypt-config
+# libgcrypt-config contains embedded paths, so swap these around.
+file usr/bin/libgcrypt-config path=usr/bin/$(MACH64)/libgcrypt-config
+file path=usr/bin/dumpsexp
+file path=usr/bin/hmac256
+file usr/bin/$(MACH32)/libgcrypt-config path=usr/bin/libgcrypt-config
 file path=usr/include/gcrypt-module.h
 file path=usr/include/gcrypt.h
 link path=usr/lib/$(MACH64)/libgcrypt.so target=libgcrypt.so.11.8.2