diff --git a/.gitignore b/.gitignore
index bd99bfa7..6a4c3f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 # We don't want lockfiles in stacks, as people could use a different package manager
 # This part will be removed by `remix.init`
+bun.lockb
 package-lock.json
-yarn.lock
 pnpm-lock.yaml
 pnpm-lock.yml
+yarn.lock
 
 node_modules
 
diff --git a/remix.init/index.js b/remix.init/index.js
index 9b8ea999..68c84d24 100644
--- a/remix.init/index.js
+++ b/remix.init/index.js
@@ -24,6 +24,11 @@ const escapeRegExp = (string) =>
 const getPackageManagerCommand = (packageManager) =>
   // Inspired by https://github.com/nrwl/nx/blob/bd9b33eaef0393d01f747ea9a2ac5d2ca1fb87c6/packages/nx/src/utils/package-manager.ts#L38-L103
   ({
+    bun: () => ({
+      exec: "bunx",
+      lockfile: "bun.lockb",
+      run: (script, args) => `bun run ${script} ${args || ""}`,
+    }),
     npm: () => ({
       exec: "npx",
       lockfile: "package-lock.json",