diff --git a/.gitignore b/.gitignore
index dfeae9971a9e4dccf571a9b69f33fe53ca3fc3e3..aa95d571c6c9375882a4943810edb57eb943abfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
+*.S
 *.a
 *.asm.s
 *.d
-*.gcno
 *.gcda
+*.gcno
 *.o
 *~
-/*.ivf
-/*.ivf.md5
+.cproject
+.project
+.settings
 /*-*.mk
 /*.asm
 /*.doxy
+/*.ivf
+/*.ivf.md5
 /.bins
 /.deps
 /.docs
@@ -18,16 +22,24 @@
 /Makefile
 /config.log
 /config.mk
-/decode_to_md5
-/decode_to_md5.dox
-/decode_with_drops
-/decode_with_drops.dox
 /docs/
 /doxyfile
-/error_resilient
-/error_resilient.dox
-/force_keyframe
-/force_keyframe.dox
+/examples/*.dox
+/examples/decode_to_md5
+/examples/decode_with_drops
+/examples/decode_with_partial_drops
+/examples/error_resilient
+/examples/example_xma
+/examples/force_keyframe
+/examples/postproc
+/examples/simple_decoder
+/examples/simple_encoder
+/examples/twopass_encoder
+/examples/vp8_multi_resolution_encoder
+/examples/vp8_set_maps
+/examples/vp8cx_set_ref
+/examples/vp9_spatial_scalable_encoder
+/examples/vpx_temporal_scalable_patterns
 /ivfdec
 /ivfdec.dox
 /ivfenc
@@ -35,31 +47,17 @@
 /libvpx.so*
 /libvpx.ver
 /obj_int_extract
-/postproc
-/postproc.dox
 /samples.dox
-/simple_decoder
-/simple_decoder.dox
-/simple_encoder
-/simple_encoder.dox
 /test_libvpx
-/twopass_encoder
-/twopass_encoder.dox
 /vp8_api1_migration.dox
-/vp8_scalable_patterns
-/vp8_scalable_patterns.dox
-/vp8_set_maps
-/vp8_set_maps.dox
-/vp8cx_set_ref
-/vp8cx_set_ref.dox
+/vp[89x]_rtcd.h
 /vpx.pc
 /vpx_config.c
 /vpx_config.h
-/vpx_rtcd.h
+/vpx_scale_rtcd.h
 /vpx_version.h
 /vpxdec
+/vpxdec.dox
 /vpxenc
+/vpxenc.dox
 TAGS
-.cproject
-.project
-.settings