diff --git a/.gitignore b/.gitignore
index 4ede8306..05179290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,22 @@
 #doxygen
 /doc/doxygen
 /doc/doxygen.cfg
+/build
+/ext/cryptopp562
+/ext/gmock-1.6.0
+/ext/gtest-1.6.0
+/lib
+/src/gui/ui_SetupWizardBase.h
+/src/gui/Makefile
+/src/gui/Makefile.Debug
+/src/gui/Makefile.Release
+/src/gui/object_script.synergy.Debug
+/src/gui/object_script.synergy.Release
+/src/gui/ui_AboutDialogBase.h
+/src/gui/ui_ActionDialogBase.h
+/src/gui/ui_HotkeyDialogBase.h
+/src/gui/ui_MainWindowBase.h
+/src/gui/ui_ScreenSettingsDialogBase.h
+/src/gui/ui_ServerConfigDialogBase.h
+/src/gui/ui_SettingsDialogBase.h
+/src/gui/tmp