diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..87e3c43d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,71 @@
+**/*~
+**/*.i
+**/*.l[ao]
+**/*.lai
+**/*.mo
+**/*.o
+**/*.plog
+
+**/*.diff
+**/*.orig
+**/*.patch
+**/*.rej
+
+**/.libs
+**/Makefile
+
+autom4te.cache
+build
+config.h
+config.log
+config.status
+libtool
+pathnames.h
+ChangeLog
+PVS-Studio.cfg
+
+doc/*.man
+doc/*.mdoc
+doc/fixman.sed
+
+init.d/*.sh
+init.d/sudo.conf
+
+src/sudo
+src/sesh
+src/check_noexec
+src/check_ttyname
+src/sudo_usage.h
+
+lib/iolog/check_iolog_path
+lib/iolog/check_iolog_util
+
+lib/util/mksiglist
+lib/util/mksigname
+lib/util/siglist.c
+lib/util/signame.c
+lib/util/util.exp
+lib/util/[a-z0-9_]*_test
+lib/util/regress/**/*.out
+lib/util/regress/**/*.err
+
+logsrvd/sudo_logsrvd
+logsrvd/sudo_sendlog
+
+plugins/sudoers/cvtsudoers
+plugins/sudoers/sudoers
+plugins/sudoers/sudoreplay
+plugins/sudoers/testsudoers
+plugins/sudoers/tsdump
+plugins/sudoers/visudo
+plugins/sudoers/prologue
+plugins/sudoers/check_[a-z0-9_]*
+plugins/sudoers/regress/**/*.out
+plugins/sudoers/regress/**/*.toke
+plugins/sudoers/regress/**/*.err
+plugins/sudoers/regress/**/*.json
+plugins/sudoers/regress/**/*.ldif
+plugins/sudoers/regress/**/*.sudo
+plugins/sudoers/regress/**/*.ldif2sudo
+plugins/sudoers/regress/iolog_plugin/iolog
+plugins/sudoers/regress/testsudoers/test3.d/root
diff --git a/.hgignore b/.hgignore
index 59d2b63ec..18f5e9d7b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -23,7 +23,6 @@ Makefile$
 ^doc/.*\.man$
 ^doc/.*\.mdoc$
 ^doc/fixman\.sed$
-^doc/varsub$
 
 ^init.d/.*.sh$
 ^init.d/sudo.conf$
@@ -34,6 +33,8 @@ Makefile$
 ^src/check_(noexec|ttyname)$
 ^src/sudo_usage\.h$
 
+^lib/iolog/check_iolog_(path|util)$
+
 ^lib/util/mksiglist$
 ^lib/util/mksigname$
 ^lib/util/siglist\.c$
@@ -42,6 +43,9 @@ Makefile$
 ^lib/util/[a-z0-9_]+_test$
 ^lib/util/regress/.*\.(out|err)$
 
+^logsrvd/sudo_(logsrvd|sendlog)$
+
 ^plugins/sudoers/(cvtsudoers|sudoers|sudoreplay|testsudoers|tsdump|visudo|prologue|check_[a-z0-9_]+)$
 ^plugins/sudoers/.*\.(out|toke|err|json|ldif|sudo|ldif2sudo)$
 ^plugins/sudoers/regress/iolog_plugin/iolog$
+^plugins/sudoers/regress/testsudoers/test3.d/root$