--- a/components/curl/curl.p5m	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/curl/curl.p5m	Wed Mar 30 13:33:31 2016 -0700
@@ -18,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
@@ -39,10 +41,10 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2007/165 value=PSARC/2012/252 \
     value=PSARC/2013/303 value=PSARC/2014/332
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/$(MACH64)/curl
-file path=usr/bin/$(MACH64)/curl-config
-file usr/bin/$(MACH64)/curl path=usr/bin/curl
-file path=usr/bin/curl-config
+# curl-config contains embedded paths, so swap these around.
+file usr/bin/curl-config path=usr/bin/$(MACH64)/curl-config
+file path=usr/bin/curl
+file usr/bin/$(MACH32)/curl-config path=usr/bin/curl-config
 file path=usr/include/curl/curl.h
 file path=usr/include/curl/curlbuild.h
 file path=usr/include/curl/curlrules.h