diff --git a/script/build_package.sh b/script/build_package.sh
index 8cb6047..5974447 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -488,7 +488,8 @@
 	source "$config_file"
 
 	# If it is a TBBR build, extract the MBED TLS library from archive
-	if [ "$(get_tf_opt TRUSTED_BOARD_BOOT)" = 1 ]; then
+	if [ "$(get_tf_opt TRUSTED_BOARD_BOOT)" = 1 ] ||
+	   [ "$(get_tf_opt MEASURED_BOOT)" = 1 ]; then
 		mbedtls_dir="$workspace/mbedtls"
 		if [ ! -d "$mbedtls_dir" ]; then
 			mbedtls_ar="$workspace/mbedtls.tar.gz"