diff --git a/.gitignore b/.gitignore
index 4962ab95c9f..7137e126cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,19 @@
 # .
 /eclipse-build
 /classes
-**/build
+build
 /idea-build
-**/dist
-**/lib
-**/test-lib
+dist
+lib
+test-lib
 /*~
 /velocity.log
 /build.properties
 /.idea
 lucene/**/*.iml
-solr/**/*.iml
 parent.iml
-**/*.ipr
-**/*.iws
+*.ipr
+*.iws
 /.project
 /.classpath
 /.settings
@@ -22,33 +21,7 @@ parent.iml
 /prj.el
 /bin
 /bin.*
-**/pom.xml
+pom.xml
 /nbproject
 /nb-build
 .pydevproject
-
-/solr/package
-
-# can this be minimized?
-/solr/example/start.jar
-/solr/example/webapps/*
-/solr/example/logs/*.log
-/solr/example/**/data
-/solr/example/solr/lib
-/solr/example/solr/logs
-/solr/example/solr/zoo_data
-/solr/example/work/*
-/solr/example/exampledocs/post.jar
-
-/solr/example/example-DIH/**/data
-/solr/example/example-DIH/**/dataimport.properties
-/solr/example/example-DIH/solr/mail/lib/*.jar
-
-solr/contrib/dataimporthandler/test-lib/
-
-solr/core/test-lib/
-
-solr/server/logs/
-solr/server/solr/zoo_data/
-solr/server/solr-webapp
-solr/server/start.jar
diff --git a/solr/.gitignore b/solr/.gitignore
new file mode 100644
index 00000000000..d02918bd00d
--- /dev/null
+++ b/solr/.gitignore
@@ -0,0 +1,30 @@
+*.iml
+
+/bin/*.pid
+
+/contrib/dataimporthandler/test-lib/
+
+/core/test-lib/
+
+/example/start.jar
+/example/webapps/*
+/example/logs/*.log
+/example/**/data
+/example/solr/lib
+/example/solr/logs
+/example/solr/zoo_data
+/example/work/*
+/example/exampledocs/post.jar
+/example/example-DIH/**/data
+/example/example-DIH/**/dataimport.properties
+/example/example-DIH/solr/mail/lib/*.jar
+
+/package
+
+/server/logs/
+/server/solr/zoo_data/
+/server/solr-webapp
+/server/start.jar
+
+*.out
+*.err
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7b3dcff43a4..a11c470195d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -236,6 +236,8 @@ Other Changes
 * SOLR-10671: Add abstract doInit method to the SolrMetricReporter base class.
   (Christine Poerschke, Anshum Gupta)
 
+* SOLR-10713: Ignore .pid and .out files in solr working directory (Jason Gerlowski via Mike Drob)
+
 ==================  6.7.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.