diff --git a/.gitignore b/.gitignore
index b3ad5f961c..ce520087a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,18 +39,25 @@ config_auto.h
 /doc/*.5
 /doc/*.html
 /doc/*.xml
-api/tesseract
-training/ambiguous_words
-training/classifier_tester
-training/cntraining
-training/combine_tessdata
-training/dawg2wordlist
-training/mftraining
-training/set_unicharset_properties
-training/shapeclustering
-training/text2image
-training/unicharset_extractor
-training/wordlist2dawg
+
+# generated version file
+/api/tess_version.h
+
+# executables
+/api/tesseract
+/training/ambiguous_words
+/training/classifier_tester
+/training/cntraining
+/training/combine_tessdata
+/training/dawg2wordlist
+/training/merge_unicharsets
+/training/mftraining
+/training/set_unicharset_properties
+/training/shapeclustering
+/training/text2image
+/training/unicharset_extractor
+/training/wordlist2dawg
+
 *.patch
 
 # files generated by libtool
@@ -86,9 +93,17 @@ kernel*.bin
 /*.lib
 /*.exe
 /*.lnk
-/win*
-.vs*
+/win*
+.vs*
 .s*
 
-# GoogleTest
-googletest
+# files generated by "make check"
+/tests/.dirstamp
+/unittest/*.trs
+
+# test programs
+/unittest/apiexample_test
+/unittest/intsimdmatrix_test
+/unittest/matrix_test
+/unittest/osd_test
+/unittest/tesseracttests