diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore.tt b/railties/lib/rails/generators/rails/app/templates/gitignore.tt
index e4e3d26971af031d06e69ce9949da0be088fedf5..b50e0a5e720e93e2f008bd97863495cfa03bff46 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore.tt
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore.tt
@@ -19,6 +19,11 @@
 <% if keeps? -%>
 !/log/.keep
 !/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
 <% end -%>
 
 <% unless skip_active_storage? -%>