diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig
index af6ac02149..40285d2968 100644
--- a/lib/std/zig/system.zig
+++ b/lib/std/zig/system.zig
@@ -473,6 +473,11 @@ pub fn resolveTargetQuery(io: Io, query: Target.Query) DetectError!Target {
         if (result.cpu.arch.isMIPS() and result.abi.float() == .soft) {
             result.cpu.features.addFeature(@intFromEnum(Target.mips.Feature.soft_float));
         }
+
+        // https://github.com/llvm/llvm-project/issues/168992
+        if (result.cpu.arch == .s390x) {
+            result.cpu.features.removeFeature(@intFromEnum(Target.s390x.Feature.vector));
+        }
     }
 
     // It's possible that we detect the native ABI, but fail to detect the OS version or were told