diff --git a/.gitignore b/.gitignore
index 7679b3c..1efe831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,14 @@
-.*
-!.git*
-**/*.pyc
+# Emacs temp files
+*~
+
+# Mac OSX
+.DS_*
+
+# waf build system
+.waf-1*
+.waf3-*
+.lock*
 build/
-waf-*
 
-
+# Compiled python code
+*.pyc