--- a/components/pam_pkcs11/pam_pkcs11.conf	Thu May 19 14:00:51 2016 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.conf	Thu May 19 14:50:15 2016 -0700
@@ -14,7 +14,7 @@
   use_pkcs11_module = default;
 
   pkcs11_module default {
-    module = /usr/lib/libpkcs11.so;
+    module = /usr/lib/64/libpkcs11.so;
     description = "Solaris PKCS#11 Cryptographic Framework library";
 
     # Which slot to use?
@@ -109,7 +109,7 @@
   # value as module search path
   # TODO:
   # This is not still functional: use absolute pathnames or LD_LIBRARY_PATH 
-  mapper_search_path = /usr/lib/pam_pkcs11;
+  mapper_search_path = /usr/lib/pam_pkcs11/64;
 
   # 
   # Generic certificate contents mapper

--- a/components/pam_pkcs11/pam_pkcs11.p5m	Thu May 19 14:00:51 2016 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Thu May 19 14:50:15 2016 -0700
@@ -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.
 #
 
 # Bypass the mangler for these files because they are pre-Solarified.
@@ -59,11 +59,14 @@
     path=usr/lib/pam_pkcs11/$(MACH64)/opensc_mapper.so
 file usr/lib/$(MACH64)/pam_pkcs11/openssh_mapper.so \
     path=usr/lib/pam_pkcs11/$(MACH64)/openssh_mapper.so
+link path=usr/lib/pam_pkcs11/64 target=$(MACH64)
 file path=usr/lib/pam_pkcs11/ldap_mapper.so
 file path=usr/lib/pam_pkcs11/opensc_mapper.so
 file path=usr/lib/pam_pkcs11/openssh_mapper.so
-file path=usr/lib/pam_pkcs11/pkcs11_inspect mode=0555
-file path=usr/lib/pam_pkcs11/pklogin_finder mode=0555
+file usr/lib/$(MACH64)/pam_pkcs11/pkcs11_inspect \
+    path=usr/lib/pam_pkcs11/pkcs11_inspect mode=0555
+file usr/lib/$(MACH64)/pam_pkcs11/pklogin_finder \
+    path=usr/lib/pam_pkcs11/pklogin_finder mode=0555
 file usr/lib/$(MACH64)/security/pam_pkcs11.so \
     path=usr/lib/security/$(MACH64)/pam_pkcs11.so
 file path=usr/lib/security/pam_pkcs11.so