diff --git a/.gitignore b/.gitignore
index 2e61830567ff..8d271bfa0e7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,27 @@
-# .
-/eclipse-build
-/maven-build
-/classes
-build
-/idea-build
-dist
-lib
-test-lib
-*~
-.#*
-/build.properties
-/.idea
-lucene/**/*.iml
-parent.iml
-*.ipr
-*.iws
-/*.iml
-.project
-.classpath
-.settings
-/.caches
-/prj.el
-bin
-/bin
-/bin.*
-pom.xml
-/nbproject
-/nb-build
-.pydevproject
-__pycache__
-/dev-tools/scripts/scripts.iml
-.DS_Store
-
-build/
+# Gradle
+#    Ignore the generated local settings file.
+/gradle.properties
 .gradle/
-.idea/
+build/
 
-# Ignore the generated local settings file.
-gradle.properties
+# IntelliJ IDEA
+/.idea/
+#    IntelliJ creates this folder, ignore.
+/dev-tools/missing-doclet/out/
 
-# IntelliJ creates this folder, ignore.
-dev-tools/missing-doclet/out/
+# Eclipse
+/.project
+/.classpath
+/.settings/
+#    Eclipse Gradle oddity
+**/bin/default/
+
+# macOS
+.DS_Store
+
+# Python
+.pydevproject
+__pycache__
+
+# Emacs backup
+*~
diff --git a/solr/.gitignore b/solr/.gitignore
index a0d8aa8096c5..e6e2e7e442ff 100644
--- a/solr/.gitignore
+++ b/solr/.gitignore
@@ -1,5 +1,3 @@
-*.iml
-
 /bin/*.pid
 
 /core/test-lib/
@@ -24,3 +22,6 @@
 
 *.out
 *.err
+
+lib/
+test-lib/