diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh
index 76eda717..d701c631 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
diff --git a/dist-build/ios.sh b/dist-build/ios.sh
index c6d2d629..bf1b7f3d 100755
--- a/dist-build/ios.sh
+++ b/dist-build/ios.sh
@@ -33,9 +33,15 @@ 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
@@ -48,7 +54,7 @@ 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
@@ -66,7 +72,7 @@ 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
@@ -79,7 +85,7 @@ 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
@@ -92,7 +98,7 @@ 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
diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh
index 17e8159e..07e3cce5 100755
--- a/dist-build/nativeclient-pnacl.sh
+++ b/dist-build/nativeclient-pnacl.sh
@@ -19,7 +19,13 @@ 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
diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh
index 2db1836d..5516d311 100755
--- a/dist-build/nativeclient-x86.sh
+++ b/dist-build/nativeclient-x86.sh
@@ -11,7 +11,14 @@ 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
diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh
index 40fe6e54..8a90c099 100755
--- a/dist-build/nativeclient-x86_64.sh
+++ b/dist-build/nativeclient-x86_64.sh
@@ -11,7 +11,13 @@ 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
diff --git a/dist-build/osx.sh b/dist-build/osx.sh
index 3e126d93..a39857b4 100755
--- a/dist-build/osx.sh
+++ b/dist-build/osx.sh
@@ -11,7 +11,13 @@ 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