diff --git a/.gitignore b/.gitignore
index f9be5e7d8522e2cf5448232ae2edbcb010262a56..6148a29a95d0bcaa062cdf89beabb1a55386a24d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,28 @@
-*.pyc
+# sphinx build directories
+_build/
+
+# dotfiles
 .*
+# compiled python files
+*.py[co]
+# setup.py egg_info
 *.egg-info
+# emacs backup files
+*~
+# hg stuff
 *.orig
-*.vim
-build
-_build
-/bin
-/dist
-/include
+status
+
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
 
-/share
-/man
-/lib
+# various virtualenv
+/bin/
+/build/
+/dist/
+/include/
+/lib/
+/man/
+/share/
+/src/