diff --git a/.gitattributes b/.gitattributes
index e23bd577d..d2c180284 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,15 @@
 *.[ch] NHSUBST
+*.cpp NHSUBST
 *.sh NHSUBST
+*.pl NHSUBST
+Porting NHSUBST
+README NHSUBST
 * text=auto
 *.hqx -text
 *.sln -text
 *.vcxproj -text
 *.doc !diff
 *.DOC !diff
-
+*.uu NH_header=no
+*.xpm NH_header=no
+.git* NH_header=no
diff --git a/DEVEL/.gitattributes b/DEVEL/.gitattributes
index 914704e1c..2e9843c2f 100644
--- a/DEVEL/.gitattributes
+++ b/DEVEL/.gitattributes
@@ -2,3 +2,5 @@
 nhgitset.pl NHSUBST
 hooksdir/* NHSUBST
 * text=auto
+DOTGIT/TARGET NH_header=no
+hooksdir/TARGET NH_header=no
diff --git a/dat/.gitattributes b/dat/.gitattributes
index b59108e49..ea45e32a3 100644
--- a/dat/.gitattributes
+++ b/dat/.gitattributes
@@ -1,3 +1,6 @@
 *.def	NHSUBST
 *.des	NHSUBST
 *.txt	NHSUBST
+data.base NHSUBST
+symbols NHSUBST
+tribute NHSUBST
diff --git a/doc/.gitattributes b/doc/.gitattributes
index a9a06f4c8..4c55e6b6c 100644
--- a/doc/.gitattributes
+++ b/doc/.gitattributes
@@ -2,4 +2,8 @@
 *.6	NHSUBST
 fixes.*	NHSUBST
 window.doc NHSUBST
-
+config.nh NHSUBST
+Guidebook.txt NH_header=no
+tmac.n NH_header=no
+fixes* NH_header=no
+*.txt NH_header=no
diff --git a/sys/msdos/.gitattributes b/sys/msdos/.gitattributes
index 7e8941f2d..304a2432d 100644
--- a/sys/msdos/.gitattributes
+++ b/sys/msdos/.gitattributes
@@ -2,3 +2,5 @@
 *.bat NHSUBST
 Makefile.* NHSUBST
 Install.* NHSUBST
+moveinit.pat NH_header=no
+vesa.h NH_header=no
diff --git a/sys/share/.gitattributes b/sys/share/.gitattributes
index 31e18fe84..4eede48ab 100644
--- a/sys/share/.gitattributes
+++ b/sys/share/.gitattributes
@@ -1 +1,6 @@
 Makefile.* NHSUBST
+NetHack.cnf NHSUBST
+termcap NH_header=no
+dgn_comp.h NH_header=no
+lev_comp.h NH_header=no
+Makefile.lib NH_header=no
diff --git a/sys/unix/.gitattributes b/sys/unix/.gitattributes
index 31e18fe84..277998292 100644
--- a/sys/unix/.gitattributes
+++ b/sys/unix/.gitattributes
@@ -1 +1,7 @@
 Makefile.* NHSUBST
+Install.unx NHSUBST
+NewInstall.unx NHSUBST
+README.linux NHSUBST
+depend.awk NHSUBST
+sysconf NHSUBST
+*shr NH_header=no
diff --git a/sys/vms/.gitattributes b/sys/vms/.gitattributes
index 21561faf1..fe31b9c25 100644
--- a/sys/vms/.gitattributes
+++ b/sys/vms/.gitattributes
@@ -1,2 +1,4 @@
 Makefile.* NHSUBST
 *.com NHSUBST
+Install.vms NHSUBST
+sysconf NHSUBST
diff --git a/sys/winnt/.gitattributes b/sys/winnt/.gitattributes
index 88f970c96..a13efc66c 100644
--- a/sys/winnt/.gitattributes
+++ b/sys/winnt/.gitattributes
@@ -1,4 +1,7 @@
 Install.nt NHSUBST
 Makefile.* NHSUBST
+defaults.nh NHSUBST
+sysconf NHSUBST
 *.rc NHSUBST
 *.bat NHSUBST
+*.def NH_header=no
diff --git a/win/Qt/.gitattributes b/win/Qt/.gitattributes
new file mode 100644
index 000000000..2d4096a92
--- /dev/null
+++ b/win/Qt/.gitattributes
@@ -0,0 +1,3 @@
+Install.Qt NHSUBST
+qpe-nethack.control NH_header=no
+knethack.lnk NH_header=no
diff --git a/win/X11/.gitattributes b/win/X11/.gitattributes
index b1b09e81a..eabdbfd44 100644
--- a/win/X11/.gitattributes
+++ b/win/X11/.gitattributes
@@ -1,2 +1,6 @@
 nh??icon  NHSUBST
 *.ad      NHSUBST
+Install.X11 NHSUBST
+nethack.rc NHSUBST
+*.bdf   NH_header=no
+*.xbm   NH_header=no
diff --git a/win/macosx/.gitattributes b/win/macosx/.gitattributes
new file mode 100644
index 000000000..a4bf76e47
--- /dev/null
+++ b/win/macosx/.gitattributes
@@ -0,0 +1 @@
+*.applescript NHSUBST
diff --git a/win/share/.gitattributes b/win/share/.gitattributes
new file mode 100644
index 000000000..09f9406f6
--- /dev/null
+++ b/win/share/.gitattributes
@@ -0,0 +1 @@
+tile.doc NHSUBST
diff --git a/win/win32/.gitattributes b/win/win32/.gitattributes
new file mode 100644
index 000000000..19106e2bb
--- /dev/null
+++ b/win/win32/.gitattributes
@@ -0,0 +1,10 @@
+*.mak NHSUBST
+*.sln -text
+*.vcxproj -text
+*.def NH_header=no
+*.sln NH_header=no
+*.vcxproj NH_header=no
+*.proj NH_header=no
+*.props NH_header=no
+resource.h NH_header=no
+nhresource.h NH_header=no