diff --git a/ChangeLog b/ChangeLog
index 95d071f1a3..e36f90e0f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 	* business-core/test/*.c -- fix the tests for begin/commit edit
 
 	* src/scm/main.scm -- fix the load of price-quotes on guile-1.4.1
+
+	* README/README.cvs -- update to reference how to "properly" use
+	  autogen.sh
 	
 2002-11-21  Benoit Grégoire  <bock@step.polymtl.ca>
 	* src/import-export/Transaction-matcher.c: Tweak the matching
diff --git a/README b/README
index b07b08ca50..61fa06e7cb 100644
--- a/README
+++ b/README
@@ -254,8 +254,8 @@ Building & Installing
 (For additional build system details, see doc/README.build-system.)
 
 GnuCash uses GNU Automake to handle the build process, so for most of
-the details, see the generic instructions in INSTALL.  (Note that, in
-order to get a working ./configure, you should run ./autogen.sh.)
+the details, see the generic instructions in INSTALL.  (If you are
+building directory from CVS, read the README.cvs for more instructions.)
 Below we detail the GnuCash specific bits.
 
 Prior to building GnuCash, you will have to obtain and install the
diff --git a/README.cvs b/README.cvs
index 70574be336..1d0d8fe35b 100644
--- a/README.cvs
+++ b/README.cvs
@@ -1,8 +1,25 @@
-This file contains guidelines for those with CVS write access.
+This file contains guidelines for using Gnucash from CVS.
 They have been adapted from the guidelines for gnome-libs by
 Miguel de Icaza who adapted them from guidelines written by
 Owen Taylor.
 
+ + In order to build GnuCash from CVS, you need to run the autogen.sh
+   command to generate and execute a configure script.  When building
+   from CVS you should ALWAYS pass your configure options directly to
+   autogen.sh.  For example:
+
+	./autogen.sh --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
+
+   Autogen will automatically generate the configure script and then
+   run it WITH SPECIAL ARGUMENTS to make sure certain files get built.
+   If you run "configure" without these special arguments, it is very likely
+   that GnuCash will fail to build.
+
+   If in doubt, you can run autogen.sh, run ./configure --help,
+   then re-run autogen.sh with your options.
+
+When making changes to GnuCash and trying to commit to the repository:
+
  + Ask first. If your changes are major, or could possibly break existing
    code, you should always ask. If your change is minor and you have
    been working on gnucash for a while it is probably not necessary
@@ -60,3 +77,6 @@ Owen Taylor.
 
 Dave Peticolas
 June 21, 2002
+
+Derek Atkins
+November 21, 2002