diff --git a/script/build_package.sh b/script/build_package.sh
index 087b223..7291f35 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -331,6 +331,10 @@
 		set +a
 	fi
 
+	if [ "$(get_tf_opt DEBUG)" = 0 ]; then
+		DEBUG=0
+	fi
+
 	make -C "$tf_root" $(cat "$tf_config_file") DEBUG="$DEBUG" V=1 "$@" \
 		${fip_targets:-fip} &>>"$build_log" || fail_build
 	)
diff --git a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
index 2ed6144..9015344 100644
--- a/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
+++ b/tf_config/fvp-tspd-tbb-mbedtls-ecdsa-dualroot
@@ -9,3 +9,4 @@
 SPD=tspd
 TF_MBEDTLS_KEY_ALG=rsa+ecdsa
 TRUSTED_BOARD_BOOT=1
+DEBUG=0