diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 27f9e927b77..a030b371ca3 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -16,9 +16,16 @@ checksum=fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|ppc64*) configure_args+=" --enable-mpers=no" ;;
 	# work around https://github.com/strace/strace/issues/133
+	i686-musl) configure_args+=" --enable-mpers=no"; makedepends+=" libucontext-devel" ;;
 	x86_64-musl) configure_args+=" --enable-mpers=no" ;;
 esac
 
+pre_configure() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
+		vsed -i configure -e "s;libunwind_LIBS=$;&-lucontext;"
+	fi
+}
+
 do_check() {
 	if [ "$XBPS_CHECK_PKGS" = full ]; then
 		# XXX: Some tests may fail inside of containers or if they are missing