diff --git a/script/build_package.sh b/script/build_package.sh
index 829b3ec..da75a87 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -442,7 +442,7 @@
 
 			url="$mbedtls_archive" saveas="$mbedtls_ar" fetch_file
 			mkdir "$mbedtls_dir"
-			extract_tarball $mbedtls_ar $mbedtls_dir
+			extract_tarball $mbedtls_ar $mbedtls_dir --strip-components=1
 		fi
 
 		emit_env "MBEDTLS_DIR" "$mbedtls_dir"
diff --git a/utils.sh b/utils.sh
index 56d8933..7c63dc9 100644
--- a/utils.sh
+++ b/utils.sh
@@ -234,14 +234,15 @@
 extract_tarball() {
 	local archive="$1"
 	local target_dir="$2"
+	local extra_params="${3:-}"
 
 	pushd "$target_dir"
 	case $(file --mime-type -b "$archive") in
 		application/gzip)
-				tar -xzf $archive
+				tar -xz $extra_params -f $archive
 				;;
 		application/zip)
-				unzip -q $archive
+				unzip -q $extra_params $archive
 				;;
 	esac
 	popd "$target_dir"