diff --git a/BRANCH_TODO b/BRANCH_TODO
index fd5cafc737..58cf974cb5 100644
--- a/BRANCH_TODO
+++ b/BRANCH_TODO
@@ -1,3 +1,4 @@
+ * separate libzigcpp.a and libzigstage1.a so that we can do non-stage1 builds
  * repair @cImport
  * make sure zig cc works
    - using it as a preprocessor (-E)
@@ -19,7 +20,6 @@
  * COFF LLD linking
  * WASM LLD linking
  * --main-pkg-path
- * --pkg-begin, --pkg-end
  * skip LLD caching when bin directory is not in the cache (so we don't put `id.txt` into the cwd)
    (maybe make it an explicit option and have main.zig disable it)
  * audit the CLI options for stage2
@@ -60,3 +60,4 @@
    in builtin.zig
  * rename std.builtin.Mode to std.builtin.OptimizeMode
  * implement `zig run` and `zig test` when combined with `--watch`
+ * close the --pkg-begin --pkg-end Package directory handles
diff --git a/lib/std/build.zig b/lib/std/build.zig
index 6f8c44ccd3..133919afc1 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1950,7 +1950,6 @@ pub const LibExeObjStep = struct {
         for (self.link_objects.span()) |link_object| {
             switch (link_object) {
                 .StaticPath => |static_path| {
-                    try zig_args.append("--object");
                     try zig_args.append(builder.pathFromRoot(static_path));
                 },
 
@@ -1958,12 +1957,10 @@ pub const LibExeObjStep = struct {
                     .Exe => unreachable,
                     .Test => unreachable,
                     .Obj => {
-                        try zig_args.append("--object");
                         try zig_args.append(other.getOutputPath());
                     },
                     .Lib => {
                         if (!other.is_dynamic or self.target.isWindows()) {
-                            try zig_args.append("--object");
                             try zig_args.append(other.getOutputLibPath());
                         } else {
                             const full_path_lib = other.getOutputPath();
@@ -1982,7 +1979,6 @@ pub const LibExeObjStep = struct {
                     try zig_args.append(name);
                 },
                 .AssemblyFile => |asm_file| {
-                    try zig_args.append("--c-source");
                     try zig_args.append(asm_file.getPath(builder));
                 },
                 .CSourceFile => |c_source_file| {
diff --git a/src/Package.zig b/src/Package.zig
index 14be8b64d6..8a0e89f883 100644
--- a/src/Package.zig
+++ b/src/Package.zig
@@ -4,6 +4,7 @@ root_src_directory: Compilation.Directory,
 /// Relative to `root_src_directory`. May contain path separators.
 root_src_path: []const u8,
 table: Table = .{},
+parent: ?*Package = null,
 
 const std = @import("std");
 const mem = std.mem;
diff --git a/src/main.zig b/src/main.zig
index 79fd681120..87ddbed343 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -215,6 +215,8 @@ const usage_build_generic =
     \\    ReleaseFast             Optimizations on, safety off
     \\    ReleaseSafe             Optimizations on, safety on
     \\    ReleaseSmall            Optimize for small binary, safety off
+    \\  --pkg-begin [name] [path] Make pkg available to import and push current pkg
+    \\  --pkg-end                 Pop current pkg
     \\  -fPIC                     Force-enable Position Independent Code
     \\  -fno-PIC                  Force-disable Position Independent Code
     \\  -fstack-check             Enable stack probing in unsafe builds
@@ -397,6 +399,13 @@ pub fn buildOutputType(
     var test_exec_args = std.ArrayList(?[]const u8).init(gpa);
     defer test_exec_args.deinit();
 
+    var root_pkg_memory: Package = .{
+        .root_src_directory = undefined,
+        .root_src_path = undefined,
+    };
+    defer root_pkg_memory.table.deinit(gpa);
+    var cur_pkg: *Package = &root_pkg_memory;
+
     switch (arg_mode) {
         .build, .translate_c, .zig_test, .run => {
             output_mode = switch (arg_mode) {
@@ -427,6 +436,33 @@ pub fn buildOutputType(
                         } else {
                             fatal("unexpected end-of-parameter mark: --", .{});
                         }
+                    } else if (mem.eql(u8, arg, "--pkg-begin")) {
+                        if (i + 2 >= args.len) fatal("Expected 2 arguments after {}", .{arg});
+                        i += 1;
+                        const pkg_name = args[i];
+                        i += 1;
+                        const pkg_path = args[i];
+
+                        const new_cur_pkg = try arena.create(Package);
+                        new_cur_pkg.* = .{
+                            .root_src_directory = if (fs.path.dirname(pkg_path)) |dirname|
+                                .{
+                                    .path = dirname,
+                                    .handle = try fs.cwd().openDir(dirname, .{}), // TODO close this fd
+                                }
+                            else
+                                .{
+                                    .path = null,
+                                    .handle = fs.cwd(),
+                                },
+                            .root_src_path = fs.path.basename(pkg_path),
+                            .parent = cur_pkg,
+                        };
+                        try cur_pkg.table.put(gpa, pkg_name, new_cur_pkg);
+                        cur_pkg = new_cur_pkg;
+                    } else if (mem.eql(u8, arg, "--pkg-end")) {
+                        cur_pkg = cur_pkg.parent orelse
+                            fatal("encountered --pkg-end with no matching --pkg-begin", .{});
                     } else if (mem.eql(u8, arg, "--color")) {
                         if (i + 1 >= args.len) {
                             fatal("expected [auto|on|off] after --color", .{});
@@ -1212,12 +1248,9 @@ pub fn buildOutputType(
         .yes => |p| p,
     };
 
-    var root_pkg_memory: Package = undefined;
     const root_pkg: ?*Package = if (root_src_file) |src_path| blk: {
-        root_pkg_memory = .{
-            .root_src_directory = .{ .path = null, .handle = fs.cwd() },
-            .root_src_path = src_path,
-        };
+        root_pkg_memory.root_src_directory = .{ .path = null, .handle = fs.cwd() };
+        root_pkg_memory.root_src_path = src_path;
         break :blk &root_pkg_memory;
     } else null;