diff --git a/.gitignore b/.gitignore
index a1d898291e..94c69f85f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,9 @@ config.h
 config.cache
 config.status
 libtool
-isc-config.sh
-configure.lineno
-autom4te.cache
+/isc-config.sh
+/configure.lineno
+autom4te.cache/
 *.o
 *.lo
 *.so
diff --git a/bin/confgen/.gitignore b/bin/confgen/.gitignore
index 05f645a34f..17533e0b43 100644
--- a/bin/confgen/.gitignore
+++ b/bin/confgen/.gitignore
@@ -1,2 +1,3 @@
 ddns-confgen
 rndc-confgen
+tsig-keygen
diff --git a/bin/delv/.gitignore b/bin/delv/.gitignore
new file mode 100644
index 0000000000..d82a0b1295
--- /dev/null
+++ b/bin/delv/.gitignore
@@ -0,0 +1 @@
+/delv
diff --git a/bin/dig/.gitignore b/bin/dig/.gitignore
index b6a6932145..a6bd583aaa 100644
--- a/bin/dig/.gitignore
+++ b/bin/dig/.gitignore
@@ -1,6 +1,6 @@
-dig
-host
-nslookup
+/dig
+/host
+/nslookup
 .libs
 dig-symtbl.c
 host-symtbl.c
diff --git a/bin/named/.gitignore b/bin/named/.gitignore
index 33d5f1cfe7..efa677a1a1 100644
--- a/bin/named/.gitignore
+++ b/bin/named/.gitignore
@@ -1,4 +1,4 @@
 .libs
-named
+/named
+/lwresd
 named-symtbl.c
-lwresd
diff --git a/bin/named/include/.gitignore b/bin/named/include/.gitignore
index 8866500f0a..a3093fc3a5 100644
--- a/bin/named/include/.gitignore
+++ b/bin/named/include/.gitignore
@@ -1 +1,2 @@
+!config.h
 !named
diff --git a/bin/pkcs11/.gitignore b/bin/pkcs11/.gitignore
new file mode 100644
index 0000000000..d6c6dce33b
--- /dev/null
+++ b/bin/pkcs11/.gitignore
@@ -0,0 +1,4 @@
+pkcs11-destroy
+pkcs11-keygen
+pkcs11-list
+pkcs11-tokens
diff --git a/bin/rndc/.gitignore b/bin/rndc/.gitignore
index d9a02c91eb..4b44ecf1e9 100644
--- a/bin/rndc/.gitignore
+++ b/bin/rndc/.gitignore
@@ -1,3 +1,3 @@
 .libs
-rndc
-rndc-confgen
+/rndc
+/rndc-confgen
diff --git a/bin/tests/pkcs11/.gitignore b/bin/tests/pkcs11/.gitignore
new file mode 100644
index 0000000000..a259902b21
--- /dev/null
+++ b/bin/tests/pkcs11/.gitignore
@@ -0,0 +1,13 @@
+create
+find
+genrsa
+login
+privrsa
+pubrsa
+random
+session
+sha1
+sign
+verify
+pkcs11-hmacmd5
+pkcs11-md5sum
diff --git a/bin/tests/system/dsdigest/.gitignore b/bin/tests/system/dsdigest/.gitignore
deleted file mode 100644
index eee491d3c6..0000000000
--- a/bin/tests/system/dsdigest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/ecdsa/.gitignore b/bin/tests/system/ecdsa/.gitignore
deleted file mode 100644
index eee491d3c6..0000000000
--- a/bin/tests/system/ecdsa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/filter-aaaa/.gitignore b/bin/tests/system/filter-aaaa/.gitignore
index 719fc327c0..9e5fe360cf 100644
--- a/bin/tests/system/filter-aaaa/.gitignore
+++ b/bin/tests/system/filter-aaaa/.gitignore
@@ -1,3 +1,4 @@
 filter-aaaa
-named1.conf
-named2.conf
+named.conf
+named.memstats
+named.run
diff --git a/bin/tests/system/gost/.gitignore b/bin/tests/system/gost/.gitignore
deleted file mode 100644
index eee491d3c6..0000000000
--- a/bin/tests/system/gost/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh
diff --git a/bin/tests/system/ixfr/ns3/.gitignore b/bin/tests/system/ixfr/ns3/.gitignore
deleted file mode 100644
index 58e5c9282d..0000000000
--- a/bin/tests/system/ixfr/ns3/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-named.conf
diff --git a/bin/tests/system/ixfr/ns4/.gitignore b/bin/tests/system/ixfr/ns4/.gitignore
deleted file mode 100644
index 58e5c9282d..0000000000
--- a/bin/tests/system/ixfr/ns4/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-named.conf
diff --git a/bin/tools/.gitignore b/bin/tools/.gitignore
index 3e2caffd69..9843f0f913 100644
--- a/bin/tools/.gitignore
+++ b/bin/tools/.gitignore
@@ -2,4 +2,5 @@ arpaname
 genrandom
 isc-hmac-fixup
 named-journalprint
+named-rrchecker
 nsec3hash
diff --git a/configure.in b/configure.in
index bd354731cb..951853f2b8 100644
--- a/configure.in
+++ b/configure.in
@@ -4088,7 +4088,7 @@ if test -f "${srcdir}/srcid"; then
 	. "${srcdir}/srcid"
 	BIND9_SRCID="SRCID=$SRCID"
 elif test -d "${srcdir}/.git"; then
-	BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
+	BIND9_SRCID="SRCID="`(cd "${srcdir}";git rev-parse --short HEAD)`
 fi
 
 AC_SUBST(BIND9_SRCID)
diff --git a/contrib/dlz/.gitignore b/contrib/dlz/.gitignore
new file mode 100644
index 0000000000..24600083db
--- /dev/null
+++ b/contrib/dlz/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/contrib/dlz/bin/.gitignore b/contrib/dlz/bin/.gitignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/contrib/dlz/bin/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/contrib/idn/idnkit-1.0-src/.gitignore b/contrib/idn/idnkit-1.0-src/.gitignore
new file mode 100644
index 0000000000..d25028d2d1
--- /dev/null
+++ b/contrib/idn/idnkit-1.0-src/.gitignore
@@ -0,0 +1,10 @@
+idn.conf.sample
+idnalias.conf.sample
+idn.conf.5
+idnalias.conf.5
+idnrc.5
+libidnkit.3
+libidnkitlite.3
+/idnconv
+/idnslookup
+/runidn
diff --git a/contrib/idn/idnkit-1.0-src/util/.gitignore b/contrib/idn/idnkit-1.0-src/util/.gitignore
new file mode 100644
index 0000000000..24600083db
--- /dev/null
+++ b/contrib/idn/idnkit-1.0-src/util/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/contrib/nslint-3.0a2/.gitignore b/contrib/nslint-3.0a2/.gitignore
new file mode 100644
index 0000000000..356afe2c94
--- /dev/null
+++ b/contrib/nslint-3.0a2/.gitignore
@@ -0,0 +1,3 @@
+/gnuc.h
+/nslint
+/version.c
diff --git a/contrib/perftcpdns/.gitignore b/contrib/perftcpdns/.gitignore
new file mode 100644
index 0000000000..b53d484c81
--- /dev/null
+++ b/contrib/perftcpdns/.gitignore
@@ -0,0 +1 @@
+perftcpdns
diff --git a/contrib/queryperf/.gitignore b/contrib/queryperf/.gitignore
new file mode 100644
index 0000000000..ddf89f8622
--- /dev/null
+++ b/contrib/queryperf/.gitignore
@@ -0,0 +1 @@
+queryperf
diff --git a/contrib/zkt-1.1.2/.gitignore b/contrib/zkt-1.1.2/.gitignore
new file mode 100644
index 0000000000..4fac1382e9
--- /dev/null
+++ b/contrib/zkt-1.1.2/.gitignore
@@ -0,0 +1,5 @@
+/zkt-conf
+/zkt-keyman
+/zkt-ls
+/zkt-signer
+/zkt-soaserial
diff --git a/contrib/zkt-1.1.2/Makefile.in b/contrib/zkt-1.1.2/Makefile.in
index 6daa47d168..b2f8ee0a71 100644
--- a/contrib/zkt-1.1.2/Makefile.in
+++ b/contrib/zkt-1.1.2/Makefile.in
@@ -94,10 +94,10 @@ $(PROG_CNF):	$(OBJ_CNF) $(OBJ_ALL) Makefile
 	$(CC) $(LDFLAGS) $(OBJ_CNF) $(OBJ_ALL) -o $(PROG_CNF)
 
 $(PROG_KEY):	$(OBJ_KEY) $(OBJ_ALL) Makefile
-	$(CC) $(LDFLAGS) $(LIBS) $(OBJ_KEY) $(OBJ_ALL) -o $(PROG_KEY)
+	$(CC) $(LDFLAGS) $(OBJ_KEY) $(OBJ_ALL) $(LIBS) -o $(PROG_KEY)
 
 $(PROG_LS):	$(OBJ_LS) $(OBJ_ALL) Makefile
-	$(CC) $(LDFLAGS) $(LIBS) $(OBJ_LS) $(OBJ_ALL) -o $(PROG_LS)
+	$(CC) $(LDFLAGS) $(OBJ_LS) $(OBJ_ALL) $(LIBS) -o $(PROG_LS)
 
 $(PROG_SER):	$(OBJ_SER) Makefile
 	$(CC) $(LDFLAGS) $(OBJ_SER) -o $(PROG_SER)
diff --git a/lib/irs/win32/include/irs/.gitignore b/lib/irs/win32/include/irs/.gitignore
new file mode 100644
index 0000000000..a705f39f34
--- /dev/null
+++ b/lib/irs/win32/include/irs/.gitignore
@@ -0,0 +1,2 @@
+!netdb.h
+!platform.h
diff --git a/lib/isc/.gitignore b/lib/isc/.gitignore
new file mode 100644
index 0000000000..734ffcd9b4
--- /dev/null
+++ b/lib/isc/.gitignore
@@ -0,0 +1 @@
+!netdb.h
diff --git a/lib/lwres/win32/include/lwres/.gitignore b/lib/lwres/win32/include/lwres/.gitignore
new file mode 100644
index 0000000000..a705f39f34
--- /dev/null
+++ b/lib/lwres/win32/include/lwres/.gitignore
@@ -0,0 +1,2 @@
+!netdb.h
+!platform.h
diff --git a/unit/.gitignore b/unit/.gitignore
index 6ff543b028..db27d5b1d7 100644
--- a/unit/.gitignore
+++ b/unit/.gitignore
@@ -1,3 +1,4 @@
+!config.h
 Makefile
 atf
 unittest.sh