diff --git a/ninja b/ninja
index a14363a1c..e4e710e39 100755
--- a/ninja
+++ b/ninja
@@ -8,7 +8,15 @@ OS="$(uname -s)"
 THIS_DIR="$(dirname "${0}")"
 
 if [ "${OS}" = "Linux" ]; then
-  exec "${THIS_DIR}/ninja-linux64" "$@"
+  machine=$(getconf LONG_BIT)
+  if [[ "$machine" = "64" ]]; then
+    exec "${THIS_DIR}/ninja-linux64" "$@"
+  elif [[ "$machine" = "32" ]]; then
+    exec "${THIS_DIR}/ninja-linux32" "$@"
+  else
+    echo Unknown architecture \($machine\) -- unable to run ninja.
+    exit 1
+  fi
 elif [ "${OS}" = "Darwin" ]; then
   exec "${THIS_DIR}/ninja-mac" "$@"
 elif [[ ${OS} == CYGWIN* ]]; then
diff --git a/ninja-linux32 b/ninja-linux32
new file mode 100755
index 000000000..65df84e7b
Binary files /dev/null and b/ninja-linux32 differ