diff --git a/.gitignore b/.gitignore
index bccab087..e3cefe05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,40 @@
+*.a
+CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
-CMakeCache.txt
-Makefile
 cmake_uninstall.cmake
-src/config.h
-src/x11/libglfw.pc
-src/win32/libglfw.pc
-src/cocoa/libglfw.pc
+*.dll
+examples/boing
+examples/gears
+examples/heightmap
+examples/splitview
+examples/triangle
+examples/wave
+*.exe
+*.exp
+*.ilk
+*.lib
+libglfw.pc
+Makefile
+*.manifest
+*.pdb
+*.res
+*.resource.txt
 *.so
-*.a
+src/config.h
+*.swp
+tests/accuracy
+tests/defaults
+tests/events
+tests/fsaa
+tests/fsfocus
+tests/gamma
+tests/iconify
+tests/joysticks
+tests/listmodes
+tests/peter
+tests/reopen
+tests/sharing
+tests/tearing
+tests/version
+tests/windows