diff --git a/.gitignore b/.gitignore
index eb2da28..c7ed116 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,35 @@
-*.sw*
+# Local stuff
+# This section is devoted to this project
+##############################
 doc/tags
+
+# Vim stuff
+##############################
+*.s[a-w][a-z]
+*.un~
+Session.vim
 .netrwhist
+*~
+
+# Packages
+##############################
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# OS generated files
+##############################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db