diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh
index 4453d434..502dc819 100755
--- a/dist-build/android-build.sh
+++ b/dist-build/android-build.sh
@@ -45,7 +45,9 @@ env - PATH="$PATH" \
     "$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
     --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi
 
diff --git a/dist-build/ios.sh b/dist-build/ios.sh
index 9b81e3bc..ec4b0315 100755
--- a/dist-build/ios.sh
+++ b/dist-build/ios.sh
@@ -33,7 +33,9 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
 
 make distclean > /dev/null
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi
 
diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh
index 80fbbbe9..6620cfec 100755
--- a/dist-build/nativeclient-pnacl.sh
+++ b/dist-build/nativeclient-pnacl.sh
@@ -19,10 +19,13 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi
 
+
 ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
             --host=nacl \
             --disable-ssp --without-pthreads \
diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh
index 637a2062..3c5fefc5 100755
--- a/dist-build/nativeclient-x86.sh
+++ b/dist-build/nativeclient-x86.sh
@@ -11,7 +11,9 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi
 
diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh
index dbe4956e..b3974310 100755
--- a/dist-build/nativeclient-x86_64.sh
+++ b/dist-build/nativeclient-x86_64.sh
@@ -11,7 +11,9 @@ mkdir -p $PREFIX || exit 1
 
 make distclean > /dev/null
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi
 
diff --git a/dist-build/osx.sh b/dist-build/osx.sh
index 501d1d2d..4e976aaa 100755
--- a/dist-build/osx.sh
+++ b/dist-build/osx.sh
@@ -11,7 +11,9 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS
 
 make distclean > /dev/null
 
-if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
+if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
+  export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
+else
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
 fi