diff --git a/configure.ac b/configure.ac
index bb761523..d5510279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,6 +414,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
   AC_MSG_CHECKING(for AESNI instructions set and PCLMULQDQ)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient doesn't properly support aesni for now
+#endif
 #pragma GCC target("aes")
 #pragma GCC target("pclmul")
 #include <wmmintrin.h>
diff --git a/dist-build/Makefile.am b/dist-build/Makefile.am
index c67fbad6..3486f7c2 100644
--- a/dist-build/Makefile.am
+++ b/dist-build/Makefile.am
@@ -12,4 +12,5 @@ EXTRA_DIST = \
 	ios.sh \
 	msys2-win32.sh \
 	msys2-win64.sh \
-	nativeclient.sh
+	nativeclient-pnacl.sh \
+	nativeclient-x86_64.sh
diff --git a/dist-build/nativeclient.sh b/dist-build/nativeclient-pnacl.sh
similarity index 90%
rename from dist-build/nativeclient.sh
rename to dist-build/nativeclient-pnacl.sh
index 1f2a7d4e..89aca92e 100755
--- a/dist-build/nativeclient.sh
+++ b/dist-build/nativeclient-pnacl.sh
@@ -13,7 +13,7 @@ export NM=${NM-"pnacl-nm"}
 export RANLIB=${RANLIB-"pnacl-ranlib"}
 export PNACL_FINALIZE=${PNACL_FINALIZE-"pnacl-finalize"}
 export PNACL_TRANSLATE=${PNACL_TRANSLATE-"pnacl-translate"}
-export CFLAGS="-O3 -fomit-frame-pointer"
+export CFLAGS="-O3 -fomit-frame-pointer -fforce-addr"
 
 mkdir -p $PREFIX || exit 1
 
@@ -21,6 +21,7 @@ make distclean > /dev/null
 
 ./configure --enable-minimal \
             --host=nacl \
+            --disable-ssp \
             --prefix="$PREFIX" || exit 1
 
 make -j3 check && make -j3 install || exit 1
diff --git a/dist-build/nativeclient-x86-64.sh b/dist-build/nativeclient-x86-64.sh
index 2eed4a54..1da163c1 100755
--- a/dist-build/nativeclient-x86-64.sh
+++ b/dist-build/nativeclient-x86-64.sh
@@ -5,7 +5,7 @@ export NACL_TOOLCHAIN=${NACL_TOOLCHAIN-"${NACL_SDK_ROOT}/toolchain/mac_x86_glibc
 export NACL_BIN=${NACL_BIN-"${NACL_TOOLCHAIN}/bin"}
 export PREFIX="$(pwd)/libsodium-nativeclient-x86-64"
 export PATH="${NACL_BIN}:$PATH"
-export CFLAGS="-O3 -fomit-frame-pointer"
+export CFLAGS="-O3 -fomit-frame-pointer -fforce-addr"
 
 mkdir -p $PREFIX || exit 1
 
@@ -13,6 +13,7 @@ make distclean > /dev/null
 
 ./configure --enable-minimal \
             --host=x86_64-nacl \
+            --disable-ssp \
             --prefix="$PREFIX" || exit 1
 
 make -j3 check && make -j3 install || exit 1