diff --git a/.gitignore b/.gitignore
index d903bc6bd3..3b3f0e750f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ regex
 
 gpl2lgpl.sed
 distinfo
-distinfo
 
 test-include
 analysis
diff --git a/csu/.gitignore b/csu/.gitignore
index 112daed819..d8933cf691 100644
--- a/csu/.gitignore
+++ b/csu/.gitignore
@@ -1,7 +1 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
-distinfo
 specs
diff --git a/libio/.gitignore b/libio/.gitignore
deleted file mode 100644
index 1297114731..0000000000
--- a/libio/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
-
-
-distinfo
diff --git a/manual/.gitignore b/manual/.gitignore
index 27f045cc1f..e92cef39b4 100644
--- a/manual/.gitignore
+++ b/manual/.gitignore
@@ -1,32 +1,29 @@
-*.dvi*
-*.info*
-*.c.texi
-*.ps
-*.pdf
-*.toc
 *.aux
-*.log
-*.tmp
+*.c.texi
 *.cp
 *.cps
+*.dvi*
 *.fn
 *.fns
-*.vr
-*.vrs
-*.tp
-*.tps
+*.info*
 *.ky
 *.kys
+*.log
+*.pdf
 *.pg
 *.pgs
-
+*.ps
+*.tmp
+*.toc
+*.tp
+*.tps
+*.vr
+*.vrs
+chapters.texi
+dir-add.texi
+dir-add.texinfo
+libm-err.texi
+stamp-*
+summary.texi
 texis
 top-menu.texi
-chapters.texi
-summary.texi
-stamp-*
-distinfo
-dir-add.texinfo
-dir-add.texi
-
-libm-err.texi
diff --git a/stdio-common/.gitignore b/stdio-common/.gitignore
deleted file mode 100644
index 1297114731..0000000000
--- a/stdio-common/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
-
-
-distinfo
diff --git a/stdlib/.gitignore b/stdlib/.gitignore
deleted file mode 100644
index 1297114731..0000000000
--- a/stdlib/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
-
-
-distinfo
diff --git a/sunrpc/.gitignore b/sunrpc/.gitignore
index 0da51c4793..fd6ab6babb 100644
--- a/sunrpc/.gitignore
+++ b/sunrpc/.gitignore
@@ -1,8 +1 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
-
 rpcsrc-4.0
-distinfo
diff --git a/sysdeps/mach/hurd/.gitignore b/sysdeps/mach/hurd/.gitignore
deleted file mode 100644
index 164bcc84a8..0000000000
--- a/sysdeps/mach/hurd/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*
diff --git a/sysdeps/unix/common/.gitignore b/sysdeps/unix/common/.gitignore
deleted file mode 100644
index 164bcc84a8..0000000000
--- a/sysdeps/unix/common/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.gz *.Z *.tar *.tgz
-=*
-TODO AUTHORS copyr-* copying.*
-glibc-*