diff --git a/build-libssl.sh b/build-libssl.sh
index 87c03cf..006d9ab 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -50,6 +50,7 @@ echo_help()
   echo "     --ios-sdk=SDKVERSION          Override iOS SDK version"
   echo "     --noparallel                  Disable running make with parallel jobs (make -j)"
   echo "     --tvos-sdk=SDKVERSION         Override tvOS SDK version"
+  echo "     --disable-bitcode             Disable embedding Bitcode"
   echo " -v, --verbose                     Enable verbose logging"
   echo "     --verbose-on-error            Dump last 500 lines from log file if an error occurs (for Travis builds)"
   echo "     --version=VERSION             OpenSSL version to build (defaults to ${DEFAULTVERSION})"
@@ -57,7 +58,6 @@ echo_help()
   echo "Options for OpenSSL 1.0.2 and lower ONLY"
   echo "     --archs=\"ARCH ARCH ...\"       Space-separated list of architectures to build"
   echo "                                     Options: ${DEFAULTARCHS}"
-  echo "     --disable-bitcode             Disable embedding Bitcode"
   echo
   echo "Options for OpenSSL 1.1.0 and higher ONLY"
   echo "     --deprecated                  Exclude no-deprecated configure option and build with deprecated methods"
@@ -377,16 +377,14 @@ echo "Build options"
 echo "  OpenSSL version: ${VERSION}"
 if [ "${BUILD_TYPE}" == "archs" ]; then
   echo "  Architectures: ${ARCHS}"
-  if [ "${CONFIG_DISABLE_BITCODE}" == "true" ]; then
-    echo "  Bitcode disabled"
-  else
-    echo "  Bitcode enabled"
-  fi
 else
   echo "  Targets: ${TARGETS}"
 fi
 echo "  iOS SDK: ${IOS_SDKVERSION}"
 echo "  tvOS SDK: ${TVOS_SDKVERSION}"
+if [ "${CONFIG_DISABLE_BITCODE}" == "true" ]; then
+  echo "  Bitcode embedding disabled"
+fi
 echo "  Number of make threads: ${BUILD_THREADS}"
 if [ -n "${CONFIG_OPTIONS}" ]; then
   echo "  Configure options: ${CONFIG_OPTIONS}"
diff --git a/config/20-ios-tvos-cross.conf b/config/20-ios-tvos-cross.conf
index be525dd..4384061 100644
--- a/config/20-ios-tvos-cross.conf
+++ b/config/20-ios-tvos-cross.conf
@@ -9,7 +9,7 @@
     "ios-tvos-cross-base" => {
         template         => 1,
         cflags           => combine('-isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common',
-                				sub { (defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared})
+                				sub { ((!defined($ENV{'CONFIG_DISABLE_BITCODE'}) || $ENV{'CONFIG_DISABLE_BITCODE'} !~ /true/) && defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared})
                 						? '-fembed-bitcode' : (); },
         					),
     },
diff --git a/scripts/build-loop-targets.sh b/scripts/build-loop-targets.sh
index b2ed37b..ac2df3f 100755
--- a/scripts/build-loop-targets.sh
+++ b/scripts/build-loop-targets.sh
@@ -32,6 +32,7 @@ do
   export SDKVERSION
   export IOS_MIN_SDK_VERSION
   export TVOS_MIN_SDK_VERSION
+  export CONFIG_DISABLE_BITCODE
 
   # Determine platform
   if [[ "${TARGET}" == "ios-sim-cross-"* ]]; then