diff --git a/.gitignore b/.gitignore
index 602124f201d..d32fecb2b2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,11 @@ Vagrantfile
 .yardoc
 /doc/
 
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids
+!/tmp/pids/.keep
+
 package-lock.json
 browsers.json
 Brewfile.lock.json
@@ -98,4 +103,4 @@ saml_*.key
 **/node_modules
 yarn-debug.log*
 yarn-error.log*
-.yarn-integrity
\ No newline at end of file
+.yarn-integrity
diff --git a/tmp/pids/.keep b/tmp/pids/.keep
new file mode 100644
index 00000000000..e69de29bb2d