diff --git a/.gitignore b/.gitignore
index d6ff91a9eab661e301ffccc9e97dc1b959adf472..5252d44e86ab1a0561e60a3d1641858ea6e51274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,34 @@
+# emacs backup file
 *~
+
+# autotools
+*.la
+*.lo
+*.m4
 *.o
+*.pyc
+.deps/
+.libs/
+INSTALL
+Makefile
+Makefile.in
+autom4te.cache/
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+test-driver
+
+# test logs generated by `make check`
+*.log
+*.trs
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..febcd8e2f426d0e42bf1868a4a8deafbd22282cb
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+includes/ngtcp2/version.h
+libngtcp2.pc