diff --git a/.gitignore b/.gitignore
index 7b1e282f2..da6336b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,23 @@
-backup
-build
-dist
-supybot.egg-info
-test-data
-test-conf
-test-logs
+*.mo
 *.pyc
-docs/_build
-docs/plugins
-*.swp
 *.swo
 *~
-*.mo
+.*.s[a-w][a-p]
+.s[a-w][a-p]
+MANIFEST
+backup/
+build/
 debian/limnoria*
 debian/python-module-stampdir/
 dist/
-push.sh
+docs/_build/
+docs/plugins/
+limnoria.egg-info/
 merge.sh
-src/version.py
-MANIFEST
+push.sh
 py3k/
+src/version.py
+supybot.egg-info/
+test-conf/
+test-data/
+test-logs/