diff --git a/ChangeLog b/ChangeLog
index 103479e7c..f21c3a04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-31  Carl Worth  <cworth@cworth.org>
+
+	* INSTALL: Add note to use ./autogen.sh instead of ./configure
+	when working with source from cvs.
+
 2005-08-31  Carl Worth  <cworth@cworth.org>
 
 	* test/get-and-set.c: Fix test to not try to set a non-invertible
diff --git a/INSTALL b/INSTALL
index 0fe692056..854113ea4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,6 +16,10 @@ This final step may require temporary root access (eg. with sudo) if
 you don't have write permission to the directory in which cairo will
 be installed.
 
+NOTE: If you are working with source from CVS rather than from a tar
+file, then you should use ./autogen.sh in place of ./configure
+anywhere it is mentioned in these instructions.
+
 More detailed build instructions
 --------------------------------