diff --git a/.cvsignore b/.gitignore
similarity index 73%
rename from .cvsignore
rename to .gitignore
index 301a63d3db..750c3b3908 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -7,3 +7,10 @@ libtool
 isc-config.sh
 configure.lineno
 autom4te.cache
+*.o
+*.lo
+*.so
+*.a
+*.la
+*_test
+timestamp
diff --git a/bin/.cvsignore b/bin/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/bin/check/.cvsignore b/bin/check/.gitignore
similarity index 66%
rename from bin/check/.cvsignore
rename to bin/check/.gitignore
index 711bcb8300..50cb127988 100644
--- a/bin/check/.cvsignore
+++ b/bin/check/.gitignore
@@ -1,6 +1,3 @@
-Makefile
 .libs
-*.la
-*.lo
 named-checkconf
 named-checkzone
diff --git a/bin/confgen/.cvsignore b/bin/confgen/.gitignore
similarity index 74%
rename from bin/confgen/.cvsignore
rename to bin/confgen/.gitignore
index 30b591e702..05f645a34f 100644
--- a/bin/confgen/.cvsignore
+++ b/bin/confgen/.gitignore
@@ -1,3 +1,2 @@
-Makefile
 ddns-confgen
 rndc-confgen
diff --git a/bin/confgen/unix/.cvsignore b/bin/confgen/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/bin/confgen/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/bin/dig/.cvsignore b/bin/dig/.gitignore
similarity index 63%
rename from bin/dig/.cvsignore
rename to bin/dig/.gitignore
index 2a9cc0de28..fbd0002643 100644
--- a/bin/dig/.cvsignore
+++ b/bin/dig/.gitignore
@@ -1,6 +1,4 @@
-Makefile
 dig
 host
 nslookup
-*.lo
 .libs
diff --git a/bin/dnssec/.cvsignore b/bin/dnssec/.gitignore
similarity index 90%
rename from bin/dnssec/.cvsignore
rename to bin/dnssec/.gitignore
index c2251128fb..d8239a43dd 100644
--- a/bin/dnssec/.cvsignore
+++ b/bin/dnssec/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 dnssec-dsfromkey
 dnssec-keyfromlabel
 dnssec-keygen
@@ -7,5 +6,4 @@ dnssec-revoke
 dnssec-settime
 dnssec-signkey
 dnssec-signzone
-*.lo
 .libs
diff --git a/bin/named/.cvsignore b/bin/named/.gitignore
similarity index 64%
rename from bin/named/.cvsignore
rename to bin/named/.gitignore
index 419ad074bf..33d5f1cfe7 100644
--- a/bin/named/.cvsignore
+++ b/bin/named/.gitignore
@@ -1,7 +1,4 @@
-Makefile
 .libs
-*.la
-*.lo
 named
 named-symtbl.c
 lwresd
diff --git a/bin/named/bind.keys.h b/bin/named/bind.keys.h
index 0177214159..61e3f700c6 100644
--- a/bin/named/bind.keys.h
+++ b/bin/named/bind.keys.h
@@ -1,6 +1,6 @@
 /*
- * Generated by bindkeys.pl 1.7 2011-01-04 23:47:13 tbox Exp  
- * From bind.keys 1.7 2011-01-03 23:45:07 each Exp  
+ * Generated by bindkeys.pl 1.7 2011/01/04 23:47:13 tbox Exp  
+ * From bind.keys 1.7 2011/01/03 23:45:07 each Exp  
  */
 #define TRUSTED_KEYS "\
 # The bind.keys file is used to override the built-in DNSSEC trust anchors\n\
diff --git a/bin/named/unix/.cvsignore b/bin/named/unix/.cvsignore
deleted file mode 100644
index 06e18a7aaf..0000000000
--- a/bin/named/unix/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.lo
-.libs
diff --git a/bin/nsupdate/.cvsignore b/bin/nsupdate/.gitignore
similarity index 51%
rename from bin/nsupdate/.cvsignore
rename to bin/nsupdate/.gitignore
index cb3694c4e2..21812a74eb 100644
--- a/bin/nsupdate/.cvsignore
+++ b/bin/nsupdate/.gitignore
@@ -1,4 +1,2 @@
-Makefile
 nsupdate
-*.lo
 .libs
diff --git a/bin/pkcs11/.cvsignore b/bin/pkcs11/.cvsignore
deleted file mode 100644
index e26a12ef93..0000000000
--- a/bin/pkcs11/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-pkcs11-destroy
-pkcs11-keygen
-pkcs11-list
diff --git a/bin/rndc/.cvsignore b/bin/rndc/.gitignore
similarity index 55%
rename from bin/rndc/.cvsignore
rename to bin/rndc/.gitignore
index 1033a2337c..d9a02c91eb 100644
--- a/bin/rndc/.cvsignore
+++ b/bin/rndc/.gitignore
@@ -1,6 +1,3 @@
-Makefile
 .libs
-*.la
-*.lo
 rndc
 rndc-confgen
diff --git a/bin/rndc/unix/.cvsignore b/bin/rndc/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/bin/rndc/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/bin/tests/.cvsignore b/bin/tests/.cvsignore
deleted file mode 100644
index 352a9f72a7..0000000000
--- a/bin/tests/.cvsignore
+++ /dev/null
@@ -1,51 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-adb_test
-byaddr_test
-byname_test
-cfg_test
-compress_test
-db_test
-entropy_test
-entropy2_test
-fsaccess_test
-genrandom
-gxba_test
-gxbn_test
-headerdep_test.sh
-hash_test
-inter_test
-journalprint
-keyboard_test
-lex_test
-lfsr_test
-log_test
-lwres_test
-lwresconf_test
-master_test
-mem_test
-mempool_test
-name_test
-nconf_test
-nxtify
-omapi_test
-ratelimiter_test
-rbt_test
-rdata_test
-res_test
-rwlock_test
-sdig
-serial_test
-shutdown_test
-sig0_test
-sock_test
-sym_test
-t_journal
-task_test
-timer_test
-tkey_test
-wire_test
-zone2_test
-zone_test
diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore
new file mode 100644
index 0000000000..0b91adcbbb
--- /dev/null
+++ b/bin/tests/.gitignore
@@ -0,0 +1,31 @@
+.libs
+genrandom
+headerdep_test.sh
+nxtify
+sdig
+t_journal
+*_test
+t_atomic
+t_db
+gsstest
+t_dst
+t_hashes
+t_master
+t_mem
+t_names
+t_net
+t_rbt
+t_resolver
+t_sockaddr
+conf.sh
+prereq.sh
+dlopen
+named.conf
+filter-aaaa
+lwtest
+rpz
+keycreate
+keydelete
+gssapi_krb
+t_tasks
+t_timers
diff --git a/bin/tests/atomic/.cvsignore b/bin/tests/atomic/.cvsignore
deleted file mode 100644
index fb9be717b6..0000000000
--- a/bin/tests/atomic/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-t_atomic
diff --git a/bin/tests/db/.cvsignore b/bin/tests/db/.cvsignore
deleted file mode 100644
index d8bbcd77fa..0000000000
--- a/bin/tests/db/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_db
-.libs
-*.lo
diff --git a/bin/tests/dst/.cvsignore b/bin/tests/dst/.cvsignore
deleted file mode 100644
index e9aee8fc08..0000000000
--- a/bin/tests/dst/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-dst_test
-t_dst
-gsstest
-.libs
-randomfile
-*.lo
diff --git a/bin/tests/hashes/.cvsignore b/bin/tests/hashes/.cvsignore
deleted file mode 100644
index f95f8afd18..0000000000
--- a/bin/tests/hashes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-t_hashes
diff --git a/bin/tests/master/.cvsignore b/bin/tests/master/.cvsignore
deleted file mode 100644
index 83a5bf043f..0000000000
--- a/bin/tests/master/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-t_master
diff --git a/bin/tests/mem/.cvsignore b/bin/tests/mem/.cvsignore
deleted file mode 100644
index 516ba8c31b..0000000000
--- a/bin/tests/mem/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_mem
-.libs
-*.lo
diff --git a/bin/tests/names/.cvsignore b/bin/tests/names/.cvsignore
deleted file mode 100644
index 156c246588..0000000000
--- a/bin/tests/names/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-t_names
diff --git a/bin/tests/net/.cvsignore b/bin/tests/net/.cvsignore
deleted file mode 100644
index e4db8d3615..0000000000
--- a/bin/tests/net/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_net
-*.lo
-.libs
diff --git a/bin/tests/rbt/.cvsignore b/bin/tests/rbt/.cvsignore
deleted file mode 100644
index 2863b94040..0000000000
--- a/bin/tests/rbt/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-t_rbt
diff --git a/bin/tests/resolver/.cvsignore b/bin/tests/resolver/.cvsignore
deleted file mode 100644
index d2d2629c99..0000000000
--- a/bin/tests/resolver/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
-t_resolver
diff --git a/bin/tests/sockaddr/.cvsignore b/bin/tests/sockaddr/.cvsignore
deleted file mode 100644
index 01eb10f74d..0000000000
--- a/bin/tests/sockaddr/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_sockaddr
-.libs
-*.lo
diff --git a/bin/tests/system/.cvsignore b/bin/tests/system/.cvsignore
deleted file mode 100644
index ea15748232..0000000000
--- a/bin/tests/system/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-conf.sh
-systests.output
diff --git a/bin/tests/system/acl/ns2/.cvsignore b/bin/tests/system/acl/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/acl/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/autosign/ns1/.cvsignore b/bin/tests/system/autosign/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/autosign/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/autosign/ns2/.cvsignore b/bin/tests/system/autosign/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/autosign/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/autosign/ns3/.cvsignore b/bin/tests/system/autosign/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/autosign/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/autosign/ns4/.cvsignore b/bin/tests/system/autosign/ns4/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/autosign/ns4/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/autosign/ns5/.cvsignore b/bin/tests/system/autosign/ns5/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/autosign/ns5/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/cacheclean/ns1/.cvsignore b/bin/tests/system/cacheclean/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/cacheclean/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/cacheclean/ns2/.cvsignore b/bin/tests/system/cacheclean/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/cacheclean/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/checknames/ns1/.cvsignore b/bin/tests/system/checknames/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/checknames/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/checknames/ns2/.cvsignore b/bin/tests/system/checknames/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/checknames/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/checknames/ns3/.cvsignore b/bin/tests/system/checknames/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/checknames/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dialup/ns1/.cvsignore b/bin/tests/system/dialup/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dialup/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dialup/ns2/.cvsignore b/bin/tests/system/dialup/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dialup/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dialup/ns3/.cvsignore b/bin/tests/system/dialup/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dialup/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dlz/.cvsignore b/bin/tests/system/dlz/.cvsignore
deleted file mode 100644
index eee491d3c6..0000000000
--- a/bin/tests/system/dlz/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/dlzexternal/.cvsignore b/bin/tests/system/dlzexternal/.cvsignore
deleted file mode 100644
index 2228352184..0000000000
--- a/bin/tests/system/dlzexternal/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-dlopen
diff --git a/bin/tests/system/dlzexternal/ns1/.cvsignore b/bin/tests/system/dlzexternal/ns1/.cvsignore
deleted file mode 100644
index 58e5c9282d..0000000000
--- a/bin/tests/system/dlzexternal/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.conf
diff --git a/bin/tests/system/dnssec/ns1/.cvsignore b/bin/tests/system/dnssec/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dnssec/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dnssec/ns2/.cvsignore b/bin/tests/system/dnssec/ns2/.cvsignore
deleted file mode 100644
index 7af15328bb..0000000000
--- a/bin/tests/system/dnssec/ns2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-private.secure.example.db
-named.run
diff --git a/bin/tests/system/dnssec/ns3/.cvsignore b/bin/tests/system/dnssec/ns3/.cvsignore
deleted file mode 100644
index 0465cd0f59..0000000000
--- a/bin/tests/system/dnssec/ns3/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.run
-example.bk
diff --git a/bin/tests/system/dnssec/ns4/.cvsignore b/bin/tests/system/dnssec/ns4/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dnssec/ns4/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dnssec/ns5/.cvsignore b/bin/tests/system/dnssec/ns5/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dnssec/ns5/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dnssec/ns6/.cvsignore b/bin/tests/system/dnssec/ns6/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dnssec/ns6/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/dnssec/ns7/.cvsignore b/bin/tests/system/dnssec/ns7/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/dnssec/ns7/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/filter-aaaa/.cvsignore b/bin/tests/system/filter-aaaa/.cvsignore
deleted file mode 100644
index 3a8c0ad9ae..0000000000
--- a/bin/tests/system/filter-aaaa/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-filter-aaaa
diff --git a/bin/tests/system/forward/ns1/.cvsignore b/bin/tests/system/forward/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/forward/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/forward/ns2/.cvsignore b/bin/tests/system/forward/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/forward/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/forward/ns3/.cvsignore b/bin/tests/system/forward/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/forward/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/forward/ns4/.cvsignore b/bin/tests/system/forward/ns4/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/forward/ns4/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/glue/ns1/.cvsignore b/bin/tests/system/glue/ns1/.cvsignore
deleted file mode 100644
index 9e0814c5fd..0000000000
--- a/bin/tests/system/glue/ns1/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.run
-cache
diff --git a/bin/tests/system/gost/.cvsignore b/bin/tests/system/gost/.cvsignore
deleted file mode 100644
index eee491d3c6..0000000000
--- a/bin/tests/system/gost/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/ixfr/ans2/.cvsignore b/bin/tests/system/ixfr/ans2/.cvsignore
deleted file mode 100644
index a93faf57f8..0000000000
--- a/bin/tests/system/ixfr/ans2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ans.run
diff --git a/bin/tests/system/ixfr/ns1/.cvsignore b/bin/tests/system/ixfr/ns1/.cvsignore
deleted file mode 100644
index d2e377c25d..0000000000
--- a/bin/tests/system/ixfr/ns1/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.conf
-named.run
diff --git a/bin/tests/system/ixfr/ns3/.cvsignore b/bin/tests/system/ixfr/ns3/.cvsignore
deleted file mode 100644
index 5c2431b869..0000000000
--- a/bin/tests/system/ixfr/ns3/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-named.conf
-named.run
-mytest.db.jnl
diff --git a/bin/tests/system/ixfr/ns4/.cvsignore b/bin/tests/system/ixfr/ns4/.cvsignore
deleted file mode 100644
index 5c2431b869..0000000000
--- a/bin/tests/system/ixfr/ns4/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-named.conf
-named.run
-mytest.db.jnl
diff --git a/bin/tests/system/limits/ns1/.cvsignore b/bin/tests/system/limits/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/limits/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/lwresd/.cvsignore b/bin/tests/system/lwresd/.cvsignore
deleted file mode 100644
index 38e7054467..0000000000
--- a/bin/tests/system/lwresd/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-lwtest
-*.lo
-.libs
diff --git a/bin/tests/system/lwresd/lwresd1/.cvsignore b/bin/tests/system/lwresd/lwresd1/.cvsignore
deleted file mode 100644
index 6f024895a5..0000000000
--- a/bin/tests/system/lwresd/lwresd1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-lwresd.run
diff --git a/bin/tests/system/lwresd/ns1/.cvsignore b/bin/tests/system/lwresd/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/lwresd/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/masterfile/.cvsignore b/bin/tests/system/masterfile/.cvsignore
deleted file mode 100644
index 58a87b097c..0000000000
--- a/bin/tests/system/masterfile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-dig.out
diff --git a/bin/tests/system/masterfile/ns1/.cvsignore b/bin/tests/system/masterfile/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/masterfile/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/masterformat/ns1/.cvsignore b/bin/tests/system/masterformat/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/masterformat/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/masterformat/ns2/.cvsignore b/bin/tests/system/masterformat/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/masterformat/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/notify/ns1/.cvsignore b/bin/tests/system/notify/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/notify/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/notify/ns2/.cvsignore b/bin/tests/system/notify/ns2/.cvsignore
deleted file mode 100644
index cbb42ee873..0000000000
--- a/bin/tests/system/notify/ns2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example.db
-named.run
diff --git a/bin/tests/system/notify/ns3/.cvsignore b/bin/tests/system/notify/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/notify/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/nsupdate/.cvsignore b/bin/tests/system/nsupdate/.cvsignore
deleted file mode 100644
index 11f3fa976e..0000000000
--- a/bin/tests/system/nsupdate/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-dig.out.ns1
-dig.out.ns2
-dig.out.ns1.after
diff --git a/bin/tests/system/nsupdate/ns1/.cvsignore b/bin/tests/system/nsupdate/ns1/.cvsignore
deleted file mode 100644
index 105706c29d..0000000000
--- a/bin/tests/system/nsupdate/ns1/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-example.db
-named.run
-update.db
diff --git a/bin/tests/system/nsupdate/ns2/.cvsignore b/bin/tests/system/nsupdate/ns2/.cvsignore
deleted file mode 100644
index 70d94600a8..0000000000
--- a/bin/tests/system/nsupdate/ns2/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-example.bk
-named.run
-update.bk
diff --git a/bin/tests/system/relay/ns1/.cvsignore b/bin/tests/system/relay/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/relay/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/relay/ns2/.cvsignore b/bin/tests/system/relay/ns2/.cvsignore
deleted file mode 100644
index cbb42ee873..0000000000
--- a/bin/tests/system/relay/ns2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example.db
-named.run
diff --git a/bin/tests/system/relay/ns3/.cvsignore b/bin/tests/system/relay/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/relay/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/relay/ns4/.cvsignore b/bin/tests/system/relay/ns4/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/relay/ns4/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/resolver/ans2/.cvsignore b/bin/tests/system/resolver/ans2/.cvsignore
deleted file mode 100644
index a93faf57f8..0000000000
--- a/bin/tests/system/resolver/ans2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ans.run
diff --git a/bin/tests/system/resolver/ans3/.cvsignore b/bin/tests/system/resolver/ans3/.cvsignore
deleted file mode 100644
index a93faf57f8..0000000000
--- a/bin/tests/system/resolver/ans3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ans.run
diff --git a/bin/tests/system/resolver/ns1/.cvsignore b/bin/tests/system/resolver/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/resolver/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/rpz/.cvsignore b/bin/tests/system/rpz/.cvsignore
deleted file mode 100644
index 05e018e460..0000000000
--- a/bin/tests/system/rpz/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-rpz
diff --git a/bin/tests/system/sortlist/ns1/.cvsignore b/bin/tests/system/sortlist/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/sortlist/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/stress/ns1/.cvsignore b/bin/tests/system/stress/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/stress/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/stress/ns2/.cvsignore b/bin/tests/system/stress/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/stress/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/stress/ns3/.cvsignore b/bin/tests/system/stress/ns3/.cvsignore
deleted file mode 100644
index 1410f2d08f..0000000000
--- a/bin/tests/system/stress/ns3/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.run
-zones.conf
diff --git a/bin/tests/system/stress/ns4/.cvsignore b/bin/tests/system/stress/ns4/.cvsignore
deleted file mode 100644
index 1410f2d08f..0000000000
--- a/bin/tests/system/stress/ns4/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.run
-zones.conf
diff --git a/bin/tests/system/stub/ns1/.cvsignore b/bin/tests/system/stub/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/stub/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/stub/ns2/.cvsignore b/bin/tests/system/stub/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/stub/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/stub/ns3/.cvsignore b/bin/tests/system/stub/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/stub/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/tkey/.cvsignore b/bin/tests/system/tkey/.cvsignore
deleted file mode 100644
index 7e5bacb359..0000000000
--- a/bin/tests/system/tkey/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-keycreate
-keydelete
-*.lo
-.libs
diff --git a/bin/tests/system/tkey/ns1/.cvsignore b/bin/tests/system/tkey/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/tkey/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/tsiggss/.cvsignore b/bin/tests/system/tsiggss/.cvsignore
deleted file mode 100644
index 8bebbb2490..0000000000
--- a/bin/tests/system/tsiggss/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-gssapi_krb
diff --git a/bin/tests/system/unknown/ns1/.cvsignore b/bin/tests/system/unknown/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/unknown/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/upforwd/ns1/.cvsignore b/bin/tests/system/upforwd/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/upforwd/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/upforwd/ns2/.cvsignore b/bin/tests/system/upforwd/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/upforwd/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/upforwd/ns3/.cvsignore b/bin/tests/system/upforwd/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/upforwd/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/v6synth/ns1/.cvsignore b/bin/tests/system/v6synth/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/v6synth/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/v6synth/ns2/.cvsignore b/bin/tests/system/v6synth/ns2/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/v6synth/ns2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/v6synth/ns3/.cvsignore b/bin/tests/system/v6synth/ns3/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/v6synth/ns3/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/views/.cvsignore b/bin/tests/system/views/.cvsignore
deleted file mode 100644
index 0d3379fb38..0000000000
--- a/bin/tests/system/views/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-dig.out.ns2.1
-dig.out.ns3.1
-dig.out.ns4.2
-dig.out.ns2.2
-dig.out.ns3.2
diff --git a/bin/tests/system/views/ns1/.cvsignore b/bin/tests/system/views/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/views/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/views/ns2/.cvsignore b/bin/tests/system/views/ns2/.cvsignore
deleted file mode 100644
index bc9653ed65..0000000000
--- a/bin/tests/system/views/ns2/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-named.conf
-example.db
-named.run
diff --git a/bin/tests/system/views/ns3/.cvsignore b/bin/tests/system/views/ns3/.cvsignore
deleted file mode 100644
index 022ff7b974..0000000000
--- a/bin/tests/system/views/ns3/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-named.conf
-named.run
-internal.bk
diff --git a/bin/tests/system/xfer/ns1/.cvsignore b/bin/tests/system/xfer/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/system/xfer/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/system/xfer/ns2/.cvsignore b/bin/tests/system/xfer/ns2/.cvsignore
deleted file mode 100644
index 188dad9ed8..0000000000
--- a/bin/tests/system/xfer/ns2/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-named.run
-example.db
-tsigzone.db
-example.db.jnl
diff --git a/bin/tests/system/xfer/ns3/.cvsignore b/bin/tests/system/xfer/ns3/.cvsignore
deleted file mode 100644
index 73995e8d0e..0000000000
--- a/bin/tests/system/xfer/ns3/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-named.run
-tsigzone.bk
-example.bk.jnl
diff --git a/bin/tests/system/xferquota/ns1/.cvsignore b/bin/tests/system/xferquota/ns1/.cvsignore
deleted file mode 100644
index fffbde54e5..0000000000
--- a/bin/tests/system/xferquota/ns1/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-changing.db
-named.run
diff --git a/bin/tests/system/xferquota/ns2/.cvsignore b/bin/tests/system/xferquota/ns2/.cvsignore
deleted file mode 100644
index 8b6af28859..0000000000
--- a/bin/tests/system/xferquota/ns2/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-named.run
-changing.bk
diff --git a/bin/tests/tasks/.cvsignore b/bin/tests/tasks/.cvsignore
deleted file mode 100644
index 8234f05c25..0000000000
--- a/bin/tests/tasks/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_tasks
-.libs
-*.lo
diff --git a/bin/tests/timers/.cvsignore b/bin/tests/timers/.cvsignore
deleted file mode 100644
index 31f5d19ac0..0000000000
--- a/bin/tests/timers/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-t_timers
-.libs
-*.lo
diff --git a/bin/tests/virtual-time/.cvsignore b/bin/tests/virtual-time/.cvsignore
deleted file mode 100644
index dc8ce267a9..0000000000
--- a/bin/tests/virtual-time/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-conf.sh
-vtwrapper.bin
-libvtwrapper.so
-setepoch
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore b/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/virtual-time/autosign-ksk/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore b/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/virtual-time/autosign-zsk/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tests/virtual-time/slave/ns1/.cvsignore b/bin/tests/virtual-time/slave/ns1/.cvsignore
deleted file mode 100644
index 6af68aad15..0000000000
--- a/bin/tests/virtual-time/slave/ns1/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-named.run
diff --git a/bin/tools/.cvsignore b/bin/tools/.gitignore
similarity index 87%
rename from bin/tools/.cvsignore
rename to bin/tools/.gitignore
index 5bdc2913b5..3e2caffd69 100644
--- a/bin/tools/.cvsignore
+++ b/bin/tools/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 arpaname
 genrandom
 isc-hmac-fixup
diff --git a/contrib/.cvsignore b/contrib/.gitignore
similarity index 100%
rename from contrib/.cvsignore
rename to contrib/.gitignore
diff --git a/contrib/dlz/bin/dlzbdb/.cvsignore b/contrib/dlz/bin/dlzbdb/.cvsignore
deleted file mode 100644
index 5e57bac628..0000000000
--- a/contrib/dlz/bin/dlzbdb/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-dlzbdb
-*.o
diff --git a/contrib/dlz/drivers/.cvsignore b/contrib/dlz/drivers/.gitignore
similarity index 100%
rename from contrib/dlz/drivers/.cvsignore
rename to contrib/dlz/drivers/.gitignore
diff --git a/contrib/queryperf/.cvsignore b/contrib/queryperf/.cvsignore
deleted file mode 100644
index 8ff7a352f0..0000000000
--- a/contrib/queryperf/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-queryperf
-config.h
-config.log
-config.cache
-config.status
-Makefile
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/arm/.cvsignore b/doc/arm/.cvsignore
deleted file mode 100644
index f00b67e062..0000000000
--- a/doc/arm/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-Makefile
-catalog
-Bv9ARM.aux
-Bv9ARM.brf
-Bv9ARM.glo
-Bv9ARM.idx
-Bv9ARM.log
-Bv9ARM.out
-Bv9ARM.tex
-Bv9ARM.tex.tmp
-Bv9ARM.toc
-releaseinfo.xml
diff --git a/doc/doxygen/.cvsignore b/doc/doxygen/.gitignore
similarity index 81%
rename from doc/doxygen/.cvsignore
rename to doc/doxygen/.gitignore
index 1d4c377b30..3bdc2b5d6b 100644
--- a/doc/doxygen/.cvsignore
+++ b/doc/doxygen/.gitignore
@@ -1,5 +1,4 @@
 Doxyfile
-Makefile
 doxygen-input-filter
 html
 xml
diff --git a/doc/misc/.cvsignore b/doc/misc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/doc/misc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/doc/xsl/.cvsignore b/doc/xsl/.gitignore
similarity index 90%
rename from doc/xsl/.cvsignore
rename to doc/xsl/.gitignore
index 6168a7e25b..d5e85fcfb6 100644
--- a/doc/xsl/.cvsignore
+++ b/doc/xsl/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 isc-docbook-chunk.xsl
 isc-docbook-html.xsl
 isc-docbook-latex.xsl
diff --git a/docutil/.cvsignore b/docutil/.cvsignore
deleted file mode 100644
index 55711bde03..0000000000
--- a/docutil/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-docbook2man-wrapper.sh
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/irs/include/irs/.cvsignore b/lib/.gitignore
similarity index 67%
rename from lib/irs/include/irs/.cvsignore
rename to lib/.gitignore
index 67360141e7..f4b58582ca 100644
--- a/lib/irs/include/irs/.cvsignore
+++ b/lib/.gitignore
@@ -1,3 +1,2 @@
-Makefile
-netdb.h
 platform.h
+netdb.h
diff --git a/lib/bind9/.cvsignore b/lib/bind9/.cvsignore
deleted file mode 100644
index b3b8e7617f..0000000000
--- a/lib/bind9/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-.libs
-*.la
-*.lo
diff --git a/lib/bind9/include/.cvsignore b/lib/bind9/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/bind9/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/bind9/include/bind9/.cvsignore b/lib/bind9/include/bind9/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/bind9/include/bind9/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/dns/.cvsignore b/lib/dns/.cvsignore
deleted file mode 100644
index b204723d93..0000000000
--- a/lib/dns/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-timestamp
-code.h
-gen
-.libs
-*.la
-*.lo
diff --git a/lib/dns/include/dns/.cvsignore b/lib/dns/.gitignore
similarity index 68%
rename from lib/dns/include/dns/.cvsignore
rename to lib/dns/.gitignore
index 5aa676e52e..8644f52ffc 100644
--- a/lib/dns/include/dns/.cvsignore
+++ b/lib/dns/.gitignore
@@ -1,4 +1,6 @@
-Makefile
-enumtype.h
+code.h
+gen
+.libs
 enumclass.h
+enumtype.h
 rdatastruct.h
diff --git a/lib/dns/include/.cvsignore b/lib/dns/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/dns/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/dns/include/dst/.cvsignore b/lib/dns/include/dst/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/dns/include/dst/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/dns/tests/.cvsignore b/lib/dns/tests/.cvsignore
deleted file mode 100644
index 6abab36d4a..0000000000
--- a/lib/dns/tests/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-atf.out
-*_test
diff --git a/lib/dns/tests/testdata/master/.cvsignore b/lib/dns/tests/testdata/master/.gitignore
similarity index 100%
rename from lib/dns/tests/testdata/master/.cvsignore
rename to lib/dns/tests/testdata/master/.gitignore
diff --git a/lib/export/.cvsignore b/lib/export/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/dns/.cvsignore b/lib/export/dns/.cvsignore
deleted file mode 100644
index 6ee29f9529..0000000000
--- a/lib/export/dns/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-code.h
-gen
-timestamp
diff --git a/lib/export/dns/include/dns/.cvsignore b/lib/export/dns/.gitignore
similarity index 68%
rename from lib/export/dns/include/dns/.cvsignore
rename to lib/export/dns/.gitignore
index 960dd99eeb..8644f52ffc 100644
--- a/lib/export/dns/include/dns/.cvsignore
+++ b/lib/export/dns/.gitignore
@@ -1,4 +1,6 @@
-Makefile
+code.h
+gen
+.libs
 enumclass.h
 enumtype.h
 rdatastruct.h
diff --git a/lib/export/dns/include/.cvsignore b/lib/export/dns/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/dns/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/dns/include/dst/.cvsignore b/lib/export/dns/include/dst/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/dns/include/dst/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/irs/.cvsignore b/lib/export/irs/.cvsignore
deleted file mode 100644
index 8df5b29f00..0000000000
--- a/lib/export/irs/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-timestamp
diff --git a/lib/export/irs/include/.cvsignore b/lib/export/irs/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/irs/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/irs/include/irs/.cvsignore b/lib/export/irs/include/irs/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/irs/include/irs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/.cvsignore b/lib/export/isc/.cvsignore
deleted file mode 100644
index 8df5b29f00..0000000000
--- a/lib/export/isc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-timestamp
diff --git a/lib/export/isc/include/.cvsignore b/lib/export/isc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/include/isc/.cvsignore b/lib/export/isc/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/nls/.cvsignore b/lib/export/isc/nls/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/nls/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/nothreads/.cvsignore b/lib/export/isc/nothreads/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/nothreads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/nothreads/include/.cvsignore b/lib/export/isc/nothreads/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/nothreads/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/nothreads/include/isc/.cvsignore b/lib/export/isc/nothreads/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/nothreads/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/pthreads/.cvsignore b/lib/export/isc/pthreads/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/pthreads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/pthreads/include/.cvsignore b/lib/export/isc/pthreads/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/pthreads/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/pthreads/include/isc/.cvsignore b/lib/export/isc/pthreads/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/pthreads/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/unix/.cvsignore b/lib/export/isc/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/unix/include/.cvsignore b/lib/export/isc/unix/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/unix/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isc/unix/include/isc/.cvsignore b/lib/export/isc/unix/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isc/unix/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isccfg/.cvsignore b/lib/export/isccfg/.cvsignore
deleted file mode 100644
index 8df5b29f00..0000000000
--- a/lib/export/isccfg/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-timestamp
diff --git a/lib/export/isccfg/include/.cvsignore b/lib/export/isccfg/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isccfg/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/isccfg/include/isccfg/.cvsignore b/lib/export/isccfg/include/isccfg/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/export/isccfg/include/isccfg/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/export/samples/.cvsignore b/lib/export/samples/.gitignore
similarity index 90%
rename from lib/export/samples/.cvsignore
rename to lib/export/samples/.gitignore
index 5e42ccc5a3..af3e922c68 100644
--- a/lib/export/samples/.cvsignore
+++ b/lib/export/samples/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 Makefile-postinstall
 nsprobe
 sample
diff --git a/lib/irs/.cvsignore b/lib/irs/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/irs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/irs/include/.cvsignore b/lib/irs/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/irs/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/.cvsignore b/lib/isc/.cvsignore
deleted file mode 100644
index b3b8e7617f..0000000000
--- a/lib/isc/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-.libs
-*.la
-*.lo
diff --git a/lib/isc/alpha/.cvsignore b/lib/isc/alpha/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/alpha/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/alpha/include/.cvsignore b/lib/isc/alpha/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/alpha/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/alpha/include/isc/.cvsignore b/lib/isc/alpha/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/alpha/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/ia64/.cvsignore b/lib/isc/ia64/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/ia64/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/ia64/include/.cvsignore b/lib/isc/ia64/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/ia64/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/ia64/include/isc/.cvsignore b/lib/isc/ia64/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/ia64/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/include/.cvsignore b/lib/isc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/include/isc/.cvsignore b/lib/isc/include/isc/.cvsignore
deleted file mode 100644
index 6dd03c914c..0000000000
--- a/lib/isc/include/isc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-platform.h
diff --git a/lib/isc/mips/.cvsignore b/lib/isc/mips/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/mips/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/mips/include/.cvsignore b/lib/isc/mips/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/mips/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/mips/include/isc/.cvsignore b/lib/isc/mips/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/mips/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/nls/.cvsignore b/lib/isc/nls/.cvsignore
deleted file mode 100644
index 1c44159d27..0000000000
--- a/lib/isc/nls/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
diff --git a/lib/isc/noatomic/.cvsignore b/lib/isc/noatomic/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/noatomic/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/noatomic/include/.cvsignore b/lib/isc/noatomic/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/noatomic/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/noatomic/include/isc/.cvsignore b/lib/isc/noatomic/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/noatomic/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/nothreads/.cvsignore b/lib/isc/nothreads/.cvsignore
deleted file mode 100644
index 1c44159d27..0000000000
--- a/lib/isc/nothreads/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
diff --git a/lib/isc/nothreads/include/.cvsignore b/lib/isc/nothreads/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/nothreads/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/nothreads/include/isc/.cvsignore b/lib/isc/nothreads/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/nothreads/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/powerpc/.cvsignore b/lib/isc/powerpc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/powerpc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/powerpc/include/.cvsignore b/lib/isc/powerpc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/powerpc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/powerpc/include/isc/.cvsignore b/lib/isc/powerpc/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/powerpc/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/pthreads/.cvsignore b/lib/isc/pthreads/.cvsignore
deleted file mode 100644
index 1c44159d27..0000000000
--- a/lib/isc/pthreads/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
diff --git a/lib/isc/pthreads/include/.cvsignore b/lib/isc/pthreads/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/pthreads/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/pthreads/include/isc/.cvsignore b/lib/isc/pthreads/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/pthreads/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/sparc64/.cvsignore b/lib/isc/sparc64/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/sparc64/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/sparc64/include/.cvsignore b/lib/isc/sparc64/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/sparc64/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/sparc64/include/isc/.cvsignore b/lib/isc/sparc64/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/sparc64/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/tests/.cvsignore b/lib/isc/tests/.cvsignore
deleted file mode 100644
index 6abab36d4a..0000000000
--- a/lib/isc/tests/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-atf.out
-*_test
diff --git a/lib/isc/unix/.cvsignore b/lib/isc/unix/.cvsignore
deleted file mode 100644
index 1c44159d27..0000000000
--- a/lib/isc/unix/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-.libs
-*.la
-*.lo
diff --git a/lib/isc/unix/include/.cvsignore b/lib/isc/unix/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/unix/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/unix/include/isc/.cvsignore b/lib/isc/unix/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/unix/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/win32/.cvsignore b/lib/isc/win32/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/win32/include/.cvsignore b/lib/isc/win32/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/win32/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/win32/include/isc/.cvsignore b/lib/isc/win32/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/win32/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_32/.cvsignore b/lib/isc/x86_32/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_32/include/.cvsignore b/lib/isc/x86_32/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_32/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_32/include/isc/.cvsignore b/lib/isc/x86_32/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_32/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_64/.cvsignore b/lib/isc/x86_64/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_64/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_64/include/.cvsignore b/lib/isc/x86_64/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_64/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isc/x86_64/include/isc/.cvsignore b/lib/isc/x86_64/include/isc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isc/x86_64/include/isc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isccc/.cvsignore b/lib/isccc/.cvsignore
deleted file mode 100644
index b3b8e7617f..0000000000
--- a/lib/isccc/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-.libs
-*.la
-*.lo
diff --git a/lib/isccc/include/.cvsignore b/lib/isccc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isccc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isccc/include/isccc/.cvsignore b/lib/isccc/include/isccc/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isccc/include/isccc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isccfg/.cvsignore b/lib/isccfg/.cvsignore
deleted file mode 100644
index b3b8e7617f..0000000000
--- a/lib/isccfg/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-.libs
-*.la
-*.lo
diff --git a/lib/isccfg/include/.cvsignore b/lib/isccfg/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isccfg/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/isccfg/include/isccfg/.cvsignore b/lib/isccfg/include/isccfg/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/isccfg/include/isccfg/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/.cvsignore b/lib/lwres/.cvsignore
deleted file mode 100644
index b3b8e7617f..0000000000
--- a/lib/lwres/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-.libs
-*.la
-*.lo
diff --git a/lib/lwres/include/.cvsignore b/lib/lwres/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/include/lwres/.cvsignore b/lib/lwres/include/lwres/.cvsignore
deleted file mode 100644
index 67360141e7..0000000000
--- a/lib/lwres/include/lwres/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-netdb.h
-platform.h
diff --git a/lib/lwres/man/.cvsignore b/lib/lwres/man/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/man/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/unix/.cvsignore b/lib/lwres/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/unix/include/.cvsignore b/lib/lwres/unix/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/unix/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/unix/include/lwres/.cvsignore b/lib/lwres/unix/include/lwres/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/unix/include/lwres/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/win32/.cvsignore b/lib/lwres/win32/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/win32/include/.cvsignore b/lib/lwres/win32/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/win32/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/lwres/win32/include/lwres/.cvsignore b/lib/lwres/win32/include/lwres/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/lwres/win32/include/lwres/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/tests/.cvsignore b/lib/tests/.cvsignore
deleted file mode 100644
index cd674ca368..0000000000
--- a/lib/tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-timestamp
-*.lo
-*.la
-.libs
diff --git a/lib/tests/include/.cvsignore b/lib/tests/include/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/tests/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/tests/include/tests/.cvsignore b/lib/tests/include/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lib/tests/include/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/make/.cvsignore b/make/.gitignore
similarity index 70%
rename from make/.cvsignore
rename to make/.gitignore
index 317ec27c1c..d46289bf38 100644
--- a/make/.cvsignore
+++ b/make/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 includes
 rules
 mkdep
diff --git a/unit/.cvsignore b/unit/.gitignore
similarity index 100%
rename from unit/.cvsignore
rename to unit/.gitignore
diff --git a/unit/atf-src/.cvsignore b/unit/atf-src/.cvsignore
deleted file mode 100644
index 20c3d874f2..0000000000
--- a/unit/atf-src/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.libs
-Makefile
-autom4te.cache
-bconfig.h
-config.log
-config.status
-configure.lineno
-libatf-c++.la
-libatf-c.la
-libtool
-stamp-h1
diff --git a/unit/atf-src/atf-c++/.cvsignore b/unit/atf-src/atf-c++/.cvsignore
deleted file mode 100644
index 02680616ae..0000000000
--- a/unit/atf-src/atf-c++/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-c++.pc
-atf_c++_test
-build.lo
-build_test
-check.lo
-check_test
-config.lo
-config_test
-macros_test
-pkg_config_test
-tests.lo
-tests_test
-utils_test
diff --git a/unit/atf-src/atf-c++/detail/.cvsignore b/unit/atf-src/atf-c++/detail/.cvsignore
deleted file mode 100644
index 645b034586..0000000000
--- a/unit/atf-src/atf-c++/detail/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-.deps
-.dirstamp
-.libs
-application.lo
-application_test
-env.lo
-env_test
-exceptions.lo
-exceptions_test
-expand.lo
-expand_test
-fs.lo
-fs_test
-libtest_helpers.la
-parser.lo
-parser_test
-process.lo
-process_test
-sanity_test
-test_helpers.lo
-text.lo
-text_test
-ui.lo
-ui_test
diff --git a/unit/atf-src/atf-c/.cvsignore b/unit/atf-src/atf-c/.cvsignore
deleted file mode 100644
index c6c159b760..0000000000
--- a/unit/atf-src/atf-c/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-.deps
-defs.h
-.dirstamp
-.libs
-atf-c.pc
-atf_c_test
-build_test
-check_test
-config_test
-error_test
-libatf_c_la-build.lo
-libatf_c_la-check.lo
-libatf_c_la-config.lo
-libatf_c_la-error.lo
-libatf_c_la-tc.lo
-libatf_c_la-tp.lo
-libatf_c_la-utils.lo
-macros_test
-pkg_config_test
-tc_test
-tp_test
-utils_test
diff --git a/unit/atf-src/atf-c/detail/.cvsignore b/unit/atf-src/atf-c/detail/.cvsignore
deleted file mode 100644
index ea9b4e9278..0000000000
--- a/unit/atf-src/atf-c/detail/.cvsignore
+++ /dev/null
@@ -1,26 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf_c_detail_libtest_helpers_la-test_helpers.lo
-dynstr_test
-env_test
-fs_test
-libatf_c_la-dynstr.lo
-libatf_c_la-env.lo
-libatf_c_la-fs.lo
-libatf_c_la-list.lo
-libatf_c_la-map.lo
-libatf_c_la-process.lo
-libatf_c_la-sanity.lo
-libatf_c_la-text.lo
-libatf_c_la-tp_main.lo
-libatf_c_la-user.lo
-libtest_helpers.la
-list_test
-map_test
-process_helpers
-process_test
-sanity_test
-test_helpers_test
-text_test
-user_test
diff --git a/unit/atf-src/atf-config/.cvsignore b/unit/atf-src/atf-config/.cvsignore
deleted file mode 100644
index e902f59c67..0000000000
--- a/unit/atf-src/atf-config/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-config
-integration_test
diff --git a/unit/atf-src/atf-report/.cvsignore b/unit/atf-src/atf-report/.cvsignore
deleted file mode 100644
index 337d22a1dd..0000000000
--- a/unit/atf-src/atf-report/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-report
-fail_helper
-integration_test
-misc_helpers
-pass_helper
-reader_test
diff --git a/unit/atf-src/atf-run/.cvsignore b/unit/atf-src/atf-run/.cvsignore
deleted file mode 100644
index d36a5f8efa..0000000000
--- a/unit/atf-src/atf-run/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-run
-atffile_test
-bad_metadata_helper
-config_test
-expect_helpers
-fs_test
-integration_test
-io_test
-misc_helpers
-pass_helper
-requirements_test
-several_tcs_helper
-signals_test
-test_program_test
-user_test
-zero_tcs_helper
diff --git a/unit/atf-src/atf-sh/.cvsignore b/unit/atf-src/atf-sh/.cvsignore
deleted file mode 100644
index 837da623b8..0000000000
--- a/unit/atf-src/atf-sh/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-check
-atf-check_test
-atf-sh
-atf_check_test
-config_test
-integration_test
-misc_helpers
-normalize_test
-tc_test
-tp_test
diff --git a/unit/atf-src/atf-version/.cvsignore b/unit/atf-src/atf-version/.cvsignore
deleted file mode 100644
index 3e3a877637..0000000000
--- a/unit/atf-src/atf-version/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.dirstamp
-.libs
-atf-version
-revision.h
-revision.h.stamp
diff --git a/unit/atf-src/bootstrap/.cvsignore b/unit/atf-src/bootstrap/.cvsignore
deleted file mode 100644
index 5b7c16c63d..0000000000
--- a/unit/atf-src/bootstrap/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.deps
-atconfig
diff --git a/unit/atf-src/doc/.cvsignore b/unit/atf-src/doc/.cvsignore
deleted file mode 100644
index 7c31856450..0000000000
--- a/unit/atf-src/doc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-atf.7
diff --git a/unit/atf-src/test-programs/.cvsignore b/unit/atf-src/test-programs/.cvsignore
deleted file mode 100644
index e8b6d684d6..0000000000
--- a/unit/atf-src/test-programs/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.dirstamp
-.libs
-c_helpers
-config_test
-cpp_helpers
-expect_test
-fork_test
-meta_data_test
-result_test
-sh_helpers
-srcdir_test
diff --git a/util/.cvsignore b/util/.cvsignore
deleted file mode 100644
index e69de29bb2..0000000000