diff --git a/setup.py b/setup.py
index c24d5e99b..5b3bf0569 100755
--- a/setup.py
+++ b/setup.py
@@ -953,7 +953,7 @@ def build_static_kittens(
 def build_static_binaries(args: Options, launcher_dir: str) -> None:
     arches = 'amd64', 'arm64'
     for os_, arches_ in {
-        'darwin': arches, 'linux': arches + ('arm',), 'freebsd': arches, 'netbsd': arches, 'openbsd': arches,
+        'darwin': arches, 'linux': arches + ('arm', '386'), 'freebsd': arches, 'netbsd': arches, 'openbsd': arches,
         'dragonfly': ('amd64',),
     }.items():
         for arch in arches_:
diff --git a/shell-integration/ssh/kitten b/shell-integration/ssh/kitten
index edd2aceb2..fe21fbb21 100755
--- a/shell-integration/ssh/kitten
+++ b/shell-integration/ssh/kitten
@@ -64,6 +64,8 @@ case "$(command uname -m)" in
     aarch64*) arch="arm64";;
     armv8*) arch="arm64";;
     arm) arch="arm";;
+    i386) arch="386";;
+    i686) arch="386";;
     *) die "Unknown CPU architecture $(command uname -m)";;
 esac