diff --git a/.gitignore b/.gitignore
index 297cac1a..b80564ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,18 @@
+# emacs backup file
 *~
-*.o
-*.lo
+
+# autotools
 *.la
-depcomp
+*.lo
 *.m4
+*.o
+.deps/
+.libs/
+INSTALL
 Makefile
 Makefile.in
-libtool
-missing
 autom4te.cache/
+compile
 config.guess
 config.h
 config.h.in
@@ -16,37 +20,14 @@ config.log
 config.status
 config.sub
 configure
+depcomp
 install-sh
-.deps/
-.libs
-lib/includes/nghttp2/nghttp2ver.h
-lib/libnghttp2.pc
-src/libnghttp2_asio.pc
+libtool
 ltmain.sh
+missing
 stamp-h1
-.deps/
-INSTALL
-.DS_STORE
-compile
 test-driver
-.dirstamp
-doc/index.rst
-doc/nghttp2.h.rst
-doc/nghttp2ver.h.rst
-doc/package_README.rst
-doc/tutorial-client.rst
-doc/tutorial-server.rst
-doc/nghttpx-howto.rst
-doc/h2load-howto.rst
-doc/tutorial-hpack.rst
-doc/python-apiref.rst
-doc/building-android-binary.rst
-doc/asio_http2.h.rst
-doc/asio_http2_server.h.rst
-doc/asio_http2_client.h.rst
-doc/libnghttp2_asio.rst
-doc/contribute.rst
-python/setup.py
-python/dist
-python/MANIFEST
-integration-tests/config.go
+
+# test logs generated by `make check`
+*.log
+*.trs
diff --git a/doc/.gitignore b/doc/.gitignore
index 65f5f835..5852bee8 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,3 +1,20 @@
+# generated files
 apiref.rst
+asio_http2.h.rst
+asio_http2_client.h.rst
+asio_http2_server.h.rst
+building-android-binary.rst
 conf.py
-manual
+contribute.rst
+h2load-howto.rst
+index.rst
+libnghttp2_asio.rst
+manual/
+nghttp2.h.rst
+nghttp2ver.h.rst
+nghttpx-howto.rst
+package_README.rst
+python-apiref.rst
+tutorial-client.rst
+tutorial-hpack.rst
+tutorial-server.rst
diff --git a/integration-tests/.gitignore b/integration-tests/.gitignore
new file mode 100644
index 00000000..ce6e582a
--- /dev/null
+++ b/integration-tests/.gitignore
@@ -0,0 +1,2 @@
+# generated files
+config.go
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 00000000..f64f46be
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,3 @@
+# generated files
+includes/nghttp2/nghttp2ver.h
+libnghttp2.pc
diff --git a/python/.gitignore b/python/.gitignore
new file mode 100644
index 00000000..9ebb0fbe
--- /dev/null
+++ b/python/.gitignore
@@ -0,0 +1,4 @@
+# generated files
+MANIFEST
+dist/
+setup.py
diff --git a/src/.gitignore b/src/.gitignore
index c108c3d0..0f291af7 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,12 +1,16 @@
+# generated files
+libnghttp2_asio.pc
+
+# programs
+deflatehd
+h2load
+inflatehd
 nghttp
 nghttpd
 nghttpx
-nghttpx-unittest
-nghttpx-unittest.log
-nghttpx-unittest.trs
-test-suite.log
-.dirstamp
+
+# build
 libnghttpx.a
-deflatehd
-inflatehd
-h2load
+
+# tests
+nghttpx-unittest
diff --git a/tests/.gitignore b/tests/.gitignore
index 4b24e3c3..42dfe637 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,3 @@
-test-suite.log
+# tests
 failmalloc
-failmalloc.log
-failmalloc.trs
 main
-main.log
-main.trs
diff --git a/third-party/http-parser/.gitignore b/third-party/http-parser/.gitignore
new file mode 100644
index 00000000..0638d751
--- /dev/null
+++ b/third-party/http-parser/.gitignore
@@ -0,0 +1 @@
+.dirstamp