diff --git a/.gitignore b/.gitignore
index 7974a43d897..614e9996239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,9 @@ ClientBin/
 node_modules/
 *.metaproj
 *.metaproj.tmp
+.atom-build.json
+tags
+TAGS
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -208,9 +211,15 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+# Common binary extensions on Windows
+*.exe
+*.dll
+*.lib
+
 ### Linux ###
 
 *~
+\#*\#
 
 # KDE directory preferences
 .directory
@@ -245,3 +254,15 @@ Temporary Items
 Session.vim
 .netrwhist
 *~
+
+Vagrantfile
+.vagrant
+
+# CMake files
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+
+# Cross compilation
+cross/rootfs/*