diff --git a/openvpn_osx/openvpn b/openvpn_osx/openvpn
index 31a90f2b7..fafd7077c 100755
Binary files a/openvpn_osx/openvpn and b/openvpn_osx/openvpn differ
diff --git a/openvpn_osx/pkcs11-helper-1.24.tar.bz2 b/openvpn_osx/pkcs11-helper-1.24.tar.bz2
new file mode 100644
index 000000000..45c6682b8
Binary files /dev/null and b/openvpn_osx/pkcs11-helper-1.24.tar.bz2 differ
diff --git a/tools/build_openvpn.sh b/tools/build_openvpn.sh
index 718022cbc..967993fd6 100644
--- a/tools/build_openvpn.sh
+++ b/tools/build_openvpn.sh
@@ -1,2 +1,27 @@
-LDFLAGS="-L/usr/local/opt/openssl/lib" CPPFLAGS="-I/usr/local/opt/openssl/include" OPENSSL_CFLAGS="-I/usr/local/opt/openssl/include" OPENSSL_LIBS="/usr/local/opt/openssl/lib/libssl.a -lz /usr/local/opt/openssl/lib/libcrypto.a -lz" LZO_LIBS="/usr/local/opt/lzo/lib/liblzo2.a" OPTIONAL_LZO_LIBS="/usr/local/opt/lzo/lib/liblzo2.a" ./configure --disable-debug --disable-silent-rules --disable-server --disable-management --disable-plugins --disable-plugin-auth-pam --disable-plugin-down-root --enable-static=yes --disable-shared
-make DESTDIR="`pwd`/root/" install
+make clean
+CFLAGS=" -arch x86_64" \
+  OPENSSL_CFLAGS="-I/usr/local/opt/openssl/include" \
+  OPENSSL_SSL_CFLAGS="-I/usr/local/opt/openssl/include" \
+  OPENSSL_CRYPTO_CFLAGS="-I/usr/local/opt/openssl/include" \
+  OPENSSL_LIBS="/usr/local/opt/openssl/lib/libssl.a -lz /usr/local/opt/openssl/lib/libcrypto.a -lz" \
+  OPENSSL_SSL_LIBS="/usr/local/opt/openssl/lib/libssl.a" \
+  OPENSSL_CRYPTO_LIBS="/usr/local/opt/openssl/lib/libcrypto.a -lz" \
+  PKCS11_HELPER_CFLAGS="-I`pwd`/../pkcs11-helper/include" \
+  PKCS11_HELPER_LIBS="-L`pwd`/../pkcs11-helper/lib -lpkcs11-helper" \
+  LZO_CFLAGS="-I/usr/local/opt/lzo/include" \
+  LZO_LIBS="/usr/local/opt/lzo/lib/liblzo2.a" \
+  OPTIONAL_LZO_LIBS="/usr/local/opt/lzo/lib/liblzo2.a" \
+  LZ4_CFLAGS="-I/usr/local/opt/lz4/include" \
+  LZ4_LIBS="/usr/local/opt/lz4/lib/liblz4.a" \
+  ./configure \
+    --disable-debug \
+    --disable-silent-rules \
+    --disable-server \
+    --disable-management \
+    --disable-plugins \
+    --disable-plugin-auth-pam \
+    --disable-plugin-down-root \
+    --enable-pkcs11 \
+    --enable-static \
+    --disable-shared
+make DESTDIR="`pwd`/../ovpn/" install
diff --git a/tools/build_pkcs11h.sh b/tools/build_pkcs11h.sh
new file mode 100644
index 000000000..cb2577f07
--- /dev/null
+++ b/tools/build_pkcs11h.sh
@@ -0,0 +1,15 @@
+make clean
+CFLAGS=" -arch x86_64" \
+  OPENSSL_CFLAGS="-I/usr/local/opt/openssl/include" \
+  OPENSSL_LIBS="-L/usr/local/opt/openssl/lib -lssl -lcrypto -lz" \
+  ./configure --build=x86_64-apple-darwin \
+    --prefix=`pwd`/../pkcs11-helper \
+    --enable-static \
+    --disable-shared \
+    --disable-slotevent \
+    --disable-threading \
+    --disable-crypto-engine-gnutls \
+    --disable-crypto-engine-nss \
+    --disable-crypto-engine-mbedtls \
+    --disable-dependency-tracking
+make install