--- a/components/bind/bindc.p5m	Tue Mar 29 09:21:13 2016 +0100
+++ b/components/bind/bindc.p5m	Tue Mar 29 09:21:13 2016 +0100
@@ -18,7 +18,7 @@
 #
 # 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.
 #
 
 # Put the various bind man pages in the right directories.
@@ -44,24 +44,24 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2009/308
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.11
-link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.11
-file path=usr/lib/dns/libbind9.so.50.0.11
-link path=usr/lib/dns/libdns.so target=libdns.so.113.1.2
-link path=usr/lib/dns/libdns.so.113 target=libdns.so.113.1.2
-file path=usr/lib/dns/libdns.so.113.1.2
-link path=usr/lib/dns/libisc.so target=libisc.so.110.0.2
-link path=usr/lib/dns/libisc.so.110 target=libisc.so.110.0.2
-file path=usr/lib/dns/libisc.so.110.0.2
-link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.6
-link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.6
-file path=usr/lib/dns/libisccc.so.50.0.6
-link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.10
-link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.10
-file path=usr/lib/dns/libisccfg.so.50.0.10
-link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.11
-link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.11
-file path=usr/lib/dns/liblwres.so.50.0.11
+link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.50.0.11
+link path=usr/lib/dns/$(MACH64)/libbind9.so.50 target=libbind9.so.50.0.11
+file path=usr/lib/dns/$(MACH64)/libbind9.so.50.0.11
+link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.113.1.2
+link path=usr/lib/dns/$(MACH64)/libdns.so.113 target=libdns.so.113.1.2
+file path=usr/lib/dns/$(MACH64)/libdns.so.113.1.2
+link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.110.0.2
+link path=usr/lib/dns/$(MACH64)/libisc.so.110 target=libisc.so.110.0.2
+file path=usr/lib/dns/$(MACH64)/libisc.so.110.0.2
+link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc.so.50.0.6
+link path=usr/lib/dns/$(MACH64)/libisccc.so.50 target=libisccc.so.50.0.6
+file path=usr/lib/dns/$(MACH64)/libisccc.so.50.0.6
+link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.50.0.10
+link path=usr/lib/dns/$(MACH64)/libisccfg.so.50 target=libisccfg.so.50.0.10
+file path=usr/lib/dns/$(MACH64)/libisccfg.so.50.0.10
+link path=usr/lib/dns/$(MACH64)/liblwres.so target=liblwres.so.50.0.11
+link path=usr/lib/dns/$(MACH64)/liblwres.so.50 target=liblwres.so.50.0.11
+file path=usr/lib/dns/$(MACH64)/liblwres.so.50.0.11
 file path=usr/sbin/dig
 file path=usr/sbin/host
 file path=usr/sbin/nslookup