diff --git a/.gitignore b/.gitignore
index 1518b6ab38..d903bc6bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,35 @@
 *~
-*.d *.o *.so *.po *.go *.bo stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz *.bz2
+*.d
+*.o
+*.so
+*.po
+*.go
+*.bo
+stamp.*
+*.stamp
+*.ustamp
+*.udeps
+*.gz
+*.Z
+*.tar
+*.tgz
+*.bz2
 =*
-TODO AUTHORS copyr-* copying.*
+TODO
+AUTHORS
+copyr-*
+copying.*
 glibc-*
 
 configparms
 
-sun[43]* i[345]86* hp300*
+sun[43]*
+i[345]86*
+hp300*
 
-ieeetest hppa-sysdeps regex
+ieeetest
+hppa-sysdeps
+regex
 
 gpl2lgpl.sed
 distinfo
@@ -20,8 +40,10 @@ analysis
 docs
 releases
 
-libc.prj .libc.prcs_aux
-libc.proj .snprj
+libc.prj
+.libc.prcs_aux
+libc.proj
+.snprj
 
 TODO.html
 
diff --git a/manual/.gitignore b/manual/.gitignore
index 54abbbb5a4..27f045cc1f 100644
--- a/manual/.gitignore
+++ b/manual/.gitignore
@@ -1,14 +1,32 @@
-*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps
-*.gz *.Z *.tar *.tgz *.bz2
-=*
-TODO COPYING* AUTHORS copyr-* copying.*
-glibc-*
+*.dvi*
+*.info*
+*.c.texi
+*.ps
+*.pdf
+*.toc
+*.aux
+*.log
+*.tmp
+*.cp
+*.cps
+*.fn
+*.fns
+*.vr
+*.vrs
+*.tp
+*.tps
+*.ky
+*.kys
+*.pg
+*.pgs
 
-*.dvi* *.info* *.c.texi *.ps *.pdf
-*.toc *.aux *.log *.tmp
-*.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs
-
-texis top-menu.texi chapters.texi summary.texi stamp-*
-distinfo dir-add.texinfo dir-add.texi
+texis
+top-menu.texi
+chapters.texi
+summary.texi
+stamp-*
+distinfo
+dir-add.texinfo
+dir-add.texi
 
 libm-err.texi