diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 00000000..119f0442
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,18 @@
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+MakeOut
+missing
+mkinstalldirs
+x11.pc
diff --git a/ChangeLog b/ChangeLog
index f4327236..3739e3b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-08  Keith Packard  <keithp@keithp.com>
+
+	* .cvsignore:
+	* include/.cvsignore:
+	* include/X11/.cvsignore:
+	* man/.cvsignore:
+	* nls/.cvsignore:
+	* src/.cvsignore:
+	Clean up .cvsignore files
+
 2005-07-07  Keith Packard  <keithp@keithp.com>
 
 	* configure.ac:
diff --git a/include/.cvsignore b/include/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/include/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/include/X11/.cvsignore b/include/X11/.cvsignore
new file mode 100644
index 00000000..7b5ed54c
--- /dev/null
+++ b/include/X11/.cvsignore
@@ -0,0 +1,2 @@
+stamp-h2
+XlibConf.h
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/nls/.cvsignore b/nls/.cvsignore
index 568afd7a..a33162ef 100644
--- a/nls/.cvsignore
+++ b/nls/.cvsignore
@@ -1,6 +1,6 @@
-Makefile
-Makefile.in
 compose.dir
 compose.dir.l1
 locale.alias
 locale.alias.l1
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
index a307c3a6..e2aa5f74 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,12 +1,12 @@
-*.lo
-*.la
-.deps
-.libs
-Makefile
-Makefile.in
+
 config.h
 config.h.in
+.deps
 force
 ks_tables.h
+*.la
+.libs
+*.lo
+Makefile
+Makefile.in
 stamp-h1
-