diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh
index 76eda717..d98ddead 100755
--- a/dist-build/android-build.sh
+++ b/dist-build/android-build.sh
@@ -45,9 +45,15 @@ env - PATH="$PATH" \
     "$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
     --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
 
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
 ./configure \
     --disable-soname-versions \
-    --enable-minimal \
+    ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
     --host="${HOST_COMPILER}" \
     --prefix="${PREFIX}" \
     --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
@@ -63,7 +69,7 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
 
   ./configure \
       --disable-soname-versions \
-      --enable-minimal \
+      ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
       --host="${HOST_COMPILER}" \
       --prefix="${PREFIX}" \
       --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
@@ -77,6 +83,10 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
   rm -f config-def.log config-def-compat.log
 fi
 
+
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
 make clean && \
-make -j3 install && \
+make -j${PROCESSORS} install && \
 echo "libsodium has been installed into ${PREFIX}"
diff --git a/dist-build/ios.sh b/dist-build/ios.sh
index 3ebc5f32..b51eaf29 100755
--- a/dist-build/ios.sh
+++ b/dist-build/ios.sh
@@ -39,12 +39,22 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
 
 make distclean > /dev/null
 
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
 ./configure --host=i686-apple-darwin10 \
             --disable-shared \
-            --enable-minimal \
+            ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$SIMULATOR32_PREFIX" || exit 1
 
-make -j3 install || exit 1
+
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
+make -j${PROCESSORS} install || exit 1
 
 ## x86_64 simulator
 export CFLAGS="-O2 -arch x86_64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
@@ -54,10 +64,10 @@ make distclean > /dev/null
 
 ./configure --host=x86_64-apple-darwin10 \
             --disable-shared \
-            --enable-minimal \
+            ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$SIMULATOR64_PREFIX"
 
-make -j3 install || exit 1
+make -j${PROCESSORS} install || exit 1
 
 # Build for iOS
 export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
@@ -72,10 +82,10 @@ make distclean > /dev/null
 
 ./configure --host=arm-apple-darwin10 \
             --disable-shared \
-            --enable-minimal \
+            ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$IOS32_PREFIX" || exit 1
 
-make -j3 install || exit 1
+make -j${PROCESSORS} install || exit 1
 
 ## 32-bit armv7s iOS
 export CFLAGS="-fembed-bitcode -O2 -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
@@ -85,10 +95,10 @@ make distclean > /dev/null
 
 ./configure --host=arm-apple-darwin10 \
             --disable-shared \
-            --enable-minimal \
+            ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$IOS32s_PREFIX" || exit 1
 
-make -j3 install || exit 1
+make -j${PROCESSORS} install || exit 1
 
 ## 64-bit iOS
 export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN} -fembed-bitcode"
@@ -98,10 +108,10 @@ make distclean > /dev/null
 
 ./configure --host=arm-apple-darwin10 \
             --disable-shared \
-            --enable-minimal \
+            ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$IOS64_PREFIX" || exit 1
 
-make -j3 install || exit 1
+make -j${PROCESSORS} install || exit 1
 
 # Create universal binary and include folder
 rm -fr -- "$PREFIX/include" "$PREFIX/libsodium.a" 2> /dev/null
diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh
index 17e8159e..020bb52c 100755
--- a/dist-build/nativeclient-pnacl.sh
+++ b/dist-build/nativeclient-pnacl.sh
@@ -19,9 +19,19 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-./configure --enable-minimal \
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
+./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --host=nacl \
             --disable-ssp --without-pthreads \
             --prefix="$PREFIX" || exit 1
 
-make -j3 check && make -j3 install || exit 1
+
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
+make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1
diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh
index 2db1836d..975add58 100755
--- a/dist-build/nativeclient-x86.sh
+++ b/dist-build/nativeclient-x86.sh
@@ -11,9 +11,19 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-./configure --enable-minimal \
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
+
+./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --host=i686-nacl \
             --disable-ssp --without-pthreads \
             --prefix="$PREFIX" || exit 1
 
-make -j3 check && make -j3 install || exit 1
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
+make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1
diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh
index 40fe6e54..43a44c8e 100755
--- a/dist-build/nativeclient-x86_64.sh
+++ b/dist-build/nativeclient-x86_64.sh
@@ -11,9 +11,19 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-./configure --enable-minimal \
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
+./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --host=x86_64-nacl \
             --disable-ssp --without-pthreads \
             --prefix="$PREFIX" || exit 1
 
-make -j3 check && make -j3 install || exit 1
+
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
+make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1
diff --git a/dist-build/osx.sh b/dist-build/osx.sh
index 3e126d93..d47a0018 100755
--- a/dist-build/osx.sh
+++ b/dist-build/osx.sh
@@ -11,10 +11,20 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS
 
 make distclean > /dev/null
 
-./configure --enable-minimal \
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
+else
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+fi
+
+./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --prefix="$PREFIX" || exit 1
 
-make -j3 check && make -j3 install || exit 1
+
+NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
+PROCESSORS=${NPROCESSORS:-3}
+
+make -j${PROCESSORS} check && make -j${PROCESSORS} install || exit 1
 
 # Cleanup
 make distclean > /dev/null