diff --git a/.gitignore b/.gitignore
index 717f5fe031af4105d05a8ebd3db8f13877ec2e28..ef02689c5d68b95a9fd91783b55e849256468f11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,22 @@
-## Generic ignorable patterns and files
+## Files related to minetest development cycle
+/*.patch
+# GNU Patch reject file
+*.rej
+
+## Editors and Development environments
 *~
-.*.swp
-*bak*
-tags
+*.swp
+*.bak*
+*.orig
+# Vim
 *.vim
-
-## Files related to minetest development cycle
-*.patch
+# Kate
+.*.kate-swp
+.swp.*
+# Eclipse (LDT)
+.project
+.settings/
+.buildpath
+.metadata
+# Idea IDE
+.idea/*