--- a/components/pam_pkcs11/pam_pkcs11.p5m	Tue Oct 27 15:58:40 2015 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Thu Oct 29 12:07:39 2015 -0700
@@ -23,6 +23,12 @@
 
 # Bypass the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
+$(SOLARIS_12_ONLY)file files/ja/pkcs11_inspect.1 $(SOLARIS_12_ONLY)path=usr/share/man/ja_JP.UTF-8/man1/pkcs11_inspect.1
+$(SOLARIS_12_ONLY)file files/ja/pklogin_finder.1 $(SOLARIS_12_ONLY)path=usr/share/man/ja_JP.UTF-8/man1/pklogin_finder.1
+$(SOLARIS_12_ONLY)file files/pkcs11_inspect.1 $(SOLARIS_12_ONLY)path=usr/share/man/man1/pkcs11_inspect.1
+$(SOLARIS_12_ONLY)file files/pklogin_finder.1 $(SOLARIS_12_ONLY)path=usr/share/man/man1/pklogin_finder.1
+$(SOLARIS_12_ONLY)file files/zh/pkcs11_inspect.1 $(SOLARIS_12_ONLY)path=usr/share/man/zh_CN.UTF-8/man1/pkcs11_inspect.1
+$(SOLARIS_12_ONLY)file files/zh/pklogin_finder.1 $(SOLARIS_12_ONLY)path=usr/share/man/zh_CN.UTF-8/man1/pklogin_finder.1
 set name=pkg.fmri \
     value=pkg:/library/security/pam/module/pam-pkcs11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The OpenSC PKCS#11 PAM Login Tools"
@@ -63,16 +69,6 @@
 file doc/mappers_api.html path=usr/share/doc/pam_pkcs11/mappers_api.html
 file doc/pam_pkcs11.html path=usr/share/doc/pam_pkcs11/pam_pkcs11.html
 file path=usr/share/locale/fr/LC_MESSAGES/pam_pkcs11.mo
-file files/ja/pkcs11_inspect.1 \
-    path=usr/share/man/ja_JP.UTF-8/man1/pkcs11_inspect.1
-file files/ja/pklogin_finder.1 \
-    path=usr/share/man/ja_JP.UTF-8/man1/pklogin_finder.1
-file files/pkcs11_inspect.1 path=usr/share/man/man1/pkcs11_inspect.1
-file files/pklogin_finder.1 path=usr/share/man/man1/pklogin_finder.1
 file files/pam_pkcs11.7 path=usr/share/man/man7/pam_pkcs11.7
-file files/zh/pkcs11_inspect.1 \
-    path=usr/share/man/zh_CN.UTF-8/man1/pkcs11_inspect.1
-file files/zh/pklogin_finder.1 \
-    path=usr/share/man/zh_CN.UTF-8/man1/pklogin_finder.1
 #
 license pam_pkcs11.license license=LGPLv2.1