diff --git a/.gitignore b/.gitignore
index ea02be907d..926f62f7c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,35 @@
-/.project
-/.classpath
-/.settings
-/target
-/reports
 /src/main/java/org/jboss/netty/util/Version.java
-/*.iml
-/*.ipr
-/*.iws
-/.metadata
-/.idea/
\ No newline at end of file
+
+# Eclipse project files
+.project
+.classpath
+.settings
+.metadata
+
+# IntelliJ IDEA project files and directories
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Geany project file
+.geany
+
+# KDevelop project file and directory
+.kdev4/
+*.kdev4
+
+# Build targets
+/target
+*/target
+
+# Report directories
+/reports
+*/reports
+
+# Mac-specific directory that no other operating system needs.
+.DS_Store
+
+# JVM crash logs
+hs_err_pid*.log
+