--- a/components/pam_pkcs11/Makefile	Tue Sep 06 15:11:54 2016 -0700
+++ b/components/pam_pkcs11/Makefile	Tue Sep 06 15:20:09 2016 -0700
@@ -60,7 +60,9 @@
 CONFIGURE_OPTIONS += --docdir=/etc/security/pam_pkcs11
 CONFIGURE_OPTIONS += OPENSSL_LIBS="$(OPENSSL_LIBS)"
 CONFIGURE_OPTIONS += PCSC_CFLAGS="-I /usr/include/PCSC"
+CONFIGURE_OPTIONS.32 += CFLAGS="$(CFLAGS) -DMODULE_ISA_FIX"
 CONFIGURE_OPTIONS.32 += --with-pcsclite=no
+CONFIGURE_OPTIONS.64 += CFLAGS="$(CFLAGS) -DMODULE_ISA_FIX -D_LP64"
 CONFIGURE_OPTIONS.64 += --with-pcsclite=yes
 
 REQUIRED_PACKAGES += library/openldap