diff --git a/.gitignore b/.gitignore
index accae11..bf8ad5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ autom4te.cache/
 config.log
 config.status
 configure
+doxygen-doc/
 libtool
 m4/libtool.m4
 m4/ltoptions.m4
@@ -15,6 +16,8 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 *.c~
 *.h~
+*.plist
+.libs
 ChangeLog
 build-aux/ar-lib
 build-aux/compile
@@ -25,6 +28,9 @@ build-aux/install-sh
 build-aux/ltmain.sh
 build-aux/missing
 build-aux/test-driver
+GPATH
+GRTAGS
+GTAGS
 tmp32/
 tmp64/
 yubico-piv-tool-*-win32.zip
@@ -35,6 +41,10 @@ yubico-piv-tool-*.tar.gz
 yubico-piv-tool-*.tar.gz.sig
 yubico-piv-tool-*-mac.zip
 yubico-piv-tool-*-mac.zip.sig
+lib/tests/api
+lib/tests/api.log
+lib/tests/api.o
+lib/tests/api.trs
 lib/tests/basic
 lib/tests/basic.log
 lib/tests/basic.o
@@ -43,19 +53,18 @@ lib/tests/parse_key
 lib/tests/parse_key.log
 lib/tests/parse_key.o
 lib/tests/parse_key.trs
-lib/tests/util
-lib/tests/util.log
-lib/tests/util.o
-lib/tests/util.trs
 lib/tests/test-suite.log
 lib/error.lo
 lib/error.o
+lib/internal.la
+lib/internal.lo
+lib/internal.o
 lib/libykpiv.la
-lib/version.lo
-lib/version.o
 lib/util.la
 lib/util.lo
 lib/util.o
+lib/version.lo
+lib/version.o
 lib/ykpiv-version.h
 lib/ykpiv.lo
 lib/ykpiv.o
@@ -74,17 +83,21 @@ tool/libpiv_cmd_la-cmdline.o
 tool/libpiv_util.la
 tool/util.lo
 tool/util.o
+tool/tests/cert_9a.pem
+tool/tests/cert_9e.pem
 tool/tests/basic.sh.log
 tool/tests/basic.sh.trs
-tool/tests/test-suite.log
+tool/tests/key_9a.pub
 tool/tests/parse_name
 tool/tests/parse_name.log
 tool/tests/parse_name.o
 tool/tests/parse_name.trs
+tool/tests/req_9e.pem
 tool/tests/test_inout
 tool/tests/test_inout.log
 tool/tests/test_inout.o
 tool/tests/test_inout.trs
+tool/tests/test-suite.log
 coverage/
 lib/error.gcno
 lib/version.gcno
@@ -98,15 +111,11 @@ ykcs11/*.lo
 ykcs11/ykcs11.pc
 ykcs11/libykcs11.la
 ykcs11/ykcs11-version.h
+ykcs11/tests/reset.sh.log
+ykcs11/tests/reset.sh.trs
+ykcs11/tests/test-suite.log
 ykcs11/tests/ykcs11_tests
 ykcs11/tests/ykcs11_tests.log
 ykcs11/tests/ykcs11_tests.o
 ykcs11/tests/ykcs11_tests.trs
-ykcs11/tests/test-suite.log
 yubico-piv-tool.1.txt
-
-*.plist
-.libs
-GPATH
-GRTAGS
-GTAGS