2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f40626efc..d6837de216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-12  Dan Winship  <danw@helixcode.com>
+
+	* README: Mention the gconf stable branch.
+
 2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
 
 	* configure.in: Updated the required version of gal.
diff --git a/README b/README
index 9f53645d43..caef199184 100644
--- a/README
+++ b/README
@@ -117,7 +117,8 @@ from the evolution preview mirror.
    *** "--disable-more-warnings" when configure, or it may fail to
    *** build.
 
- - gconf - 0.9.0 or later
+ - gconf - 0.9.0 or later. (If you get this from GNOME CVS, use the
+   "gconf-1-0" branch.
 
  - gnome-vfs - 0.3 or later