diff --git a/.gitignore b/.gitignore
index 10709171e1..083d4ef585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 *.so
 *.sl
 *.so.*
+*.dylib.*
 *.xdr.c
 *.cs.c
 *.ss.c
@@ -52,16 +53,31 @@ AFS_component_version_number.h
 /golast.bat
 
 # Destination build directories
-/amd64_linux26
-/hp_ux102
-/hp_ux110
-/i386_linux22
-/i386_linux24
-/i386_linux26
-/i386_umlinux22
-/i386_umlinux24
-/parisc_linux24
+/alpha_nbsd*
+/alpha_dux*
+/amd64_linux*
+/amd64_fsbd*
+/amd64_nbsd*
+/hp_ux*
+/i386_dfbsd*
+/i386_fbsd*
+/i386_nbsd*
+/i386_obsd*
+/i386_linux*
+/i386_umlinux*
+/ia64_hpux*
+/ia64_linux*
+/parisc_linux*
+/ppc_darwin*
+/ppc_nbsd*
+/ppc64_linux*
+/rs_aix*
+/s390_linux*
+/s390x_linux*
 /sgi_65
-/sun4x_56
-/sun4x_57
-
+/sparc64_obsd*
+/sparc64_linux*
+/sun4_*
+/sun4x_*
+/sunx86_*
+/x86_darwin*
diff --git a/doc/xml/AdminGuide/.gitignore b/doc/xml/AdminGuide/.gitignore
index 0e5cde877e..563333e3b3 100644
--- a/doc/xml/AdminGuide/.gitignore
+++ b/doc/xml/AdminGuide/.gitignore
@@ -5,5 +5,3 @@
 *.html
 *.pdf
 version.xml
-
-!Makefile
diff --git a/doc/xml/QuickStartUnix/.gitignore b/doc/xml/QuickStartUnix/.gitignore
index 0e5cde877e..563333e3b3 100644
--- a/doc/xml/QuickStartUnix/.gitignore
+++ b/doc/xml/QuickStartUnix/.gitignore
@@ -5,5 +5,3 @@
 *.html
 *.pdf
 version.xml
-
-!Makefile
diff --git a/doc/xml/UserGuide/.gitignore b/doc/xml/UserGuide/.gitignore
index 0e5cde877e..563333e3b3 100644
--- a/doc/xml/UserGuide/.gitignore
+++ b/doc/xml/UserGuide/.gitignore
@@ -5,5 +5,3 @@
 *.html
 *.pdf
 version.xml
-
-!Makefile
diff --git a/src/config/.gitignore b/src/config/.gitignore
index 06916db5ba..3a457add00 100644
--- a/src/config/.gitignore
+++ b/src/config/.gitignore
@@ -7,6 +7,7 @@
 /Makefile.config
 /Makefile.version
 /Makefile.version-NOCML
+/Makefile.version-CML
 /afsconfig.h
 /afsconfig.h.in
 /config
diff --git a/src/libafs/.gitignore b/src/libafs/.gitignore
index 8ecfa7b7df..607091f736 100644
--- a/src/libafs/.gitignore
+++ b/src/libafs/.gitignore
@@ -10,6 +10,7 @@
 /MakefileProto.*
 !/MakefileProto.*.in
 /afs
+/afs.x86_darwin_90.plist
 /afsint
 /asm
 /asm-generic
diff --git a/src/platform/DARWIN/.gitignore b/src/platform/DARWIN/.gitignore
new file mode 100644
index 0000000000..a15ad26a0a
--- /dev/null
+++ b/src/platform/DARWIN/.gitignore
@@ -0,0 +1,6 @@
+# After changing this file, please run
+#     git ls-files -i --exclude-standard
+# to check that you haven't inadvertently ignored any tracked files.
+
+afssettings
+