diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 00000000..44db55ff
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,15 @@
+.deps
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+depcomp
+install-sh
+missing
+stamp-h1
+xcompmgr
diff --git a/ChangeLog b/ChangeLog
index 7607355b..45020445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-06  Eric Anholt  <anholt@FreeBSD.org>
+
+	* .cvsignore:
+	* configure.ac:
+	Add the foreign flag so autotools doesn't incorrectly slap a GPL on
+	this, and add a .cvsignore for cvs up clarity.
+
 2005-10-06  Eric Anholt  <anholt@FreeBSD.org>
 
 	* xcompmgr.c: (give_me_a_name), (main):
diff --git a/configure.ac b/configure.ac
index 67caa05a..686b0e25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.57)
 AC_INIT([xcompmgr], [1.1.2], [xorg@freedesktop.org])
 AC_CONFIG_SRCDIR([xcompmgr.c])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADER([config.h])