diff --git a/test/standalone/build.zig b/test/standalone/build.zig
index cf08c9b182..9529e6907e 100644
--- a/test/standalone/build.zig
+++ b/test/standalone/build.zig
@@ -50,6 +50,7 @@ pub fn build(b: *std.Build) void {
         "../../tools/update_glibc.zig",
         "../../tools/update_mingw.zig",
         "../../tools/update_netbsd_libc.zig",
+        "../../tools/update_openbsd_libc.zig",
     }) |tool_src_path| {
         if (std.mem.endsWith(u8, tool_src_path, "dump-cov.zig") and tools_target.result.os.tag == .windows) continue;
 
diff --git a/tools/update_openbsd_libc.zig b/tools/update_openbsd_libc.zig
new file mode 100644
index 0000000000..9da755f8ff
--- /dev/null
+++ b/tools/update_openbsd_libc.zig
@@ -0,0 +1,61 @@
+//! This script updates the .c, .h, .s, and .S files that make up the start
+//! files such as crt1.o.
+//!
+//! Example usage:
+//! `zig run tools/update_openbsd_libc.zig -- ~/Downloads/openbsd-src .`
+
+const std = @import("std");
+const Io = std.Io;
+
+const exempt_files = [_][]const u8{
+    // This file is maintained by a separate project and does not come from OpenBSD.
+    "abilists",
+};
+
+pub fn main(init: std.process.Init) !void {
+    const arena = init.arena.allocator();
+    const io = init.io;
+    const args = try init.minimal.args.toSlice(arena);
+
+    const openbsd_src_path = args[1];
+    const zig_src_path = args[2];
+
+    const dest_dir_path = try std.fmt.allocPrint(arena, "{s}/lib/libc/openbsd", .{zig_src_path});
+
+    var dest_dir = Io.Dir.cwd().openDir(io, dest_dir_path, .{ .iterate = true }) catch |err| {
+        std.log.err("unable to open destination directory '{s}': {t}", .{ dest_dir_path, err });
+        std.process.exit(1);
+    };
+    defer dest_dir.close(io);
+
+    var openbsd_src_dir = try Io.Dir.cwd().openDir(io, openbsd_src_path, .{});
+    defer openbsd_src_dir.close(io);
+
+    // Copy updated files from upstream.
+    {
+        var walker = try dest_dir.walk(arena);
+        defer walker.deinit();
+
+        walk: while (try walker.next(io)) |entry| {
+            if (entry.kind != .file) continue;
+            if (std.mem.startsWith(u8, entry.basename, ".")) continue;
+            for (exempt_files) |p| {
+                if (std.mem.eql(u8, entry.path, p)) continue :walk;
+            }
+
+            std.log.info("updating '{s}/{s}' from '{s}/{s}'", .{
+                dest_dir_path,    entry.path,
+                openbsd_src_path, entry.path,
+            });
+
+            openbsd_src_dir.copyFile(entry.path, dest_dir, entry.path, io, .{}) catch |err| {
+                std.log.warn("unable to copy '{s}/{s}' to '{s}/{s}': {t}", .{
+                    openbsd_src_path, entry.path, dest_dir_path, entry.path, err,
+                });
+                if (err == error.FileNotFound) {
+                    try dest_dir.deleteFile(io, entry.path);
+                }
+            };
+        }
+    }
+}