diff --git a/ChangeLog b/ChangeLog
index c8334e8be5..0d0f04ac67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-20  Mukund Sivaraman <muks@mukund.org>
+
+	* autogen.sh
+	* README.i18n: Updated with Subversion instructions.
+
 2007-01-20  Mukund Sivaraman <muks@mukund.org>
 
 	* HACKING: Updated with Subversion instructions.
diff --git a/README.i18n b/README.i18n
index 7a13852144..7360d0a521 100644
--- a/README.i18n
+++ b/README.i18n
@@ -169,15 +169,17 @@ this one may not necessarily fit.
    po-tips/gimp20-tips.pot            --  the startup tips
 
  If you are looking for the translations of gimp-perl, please note that
- gimp-perl has been moved into it's own CVS module called gimp-perl.
+ gimp-perl has been moved into it's own Subversion module called
+ gimp-perl.
 
- The version of GIMP you are holding in your hand uses GTK+-2.0.
- GTK+-2.0 requires that all strings are UTF-8 encoded. Therefore to make
- internationalisation work, po files need to be UTF-8 encoded. If your
- editor doesn't support UTF-8, you need to convert it to an encoding your
- editor can handle and convert it back to UTF-8 before commiting your
- changes back. The gnome-i18n module in CVS has some scripts that help
- with this task, but it can also easily done using iconv.
+ The version of GIMP you are holding in your hand uses GTK+-2.0. 
+ GTK+-2.0 requires that all strings are UTF-8 encoded. Therefore to
+ make internationalisation work, po files need to be UTF-8 encoded. If
+ your editor doesn't support UTF-8, you need to convert it to an
+ encoding your editor can handle and convert it back to UTF-8 before
+ commiting your changes back. The gnome-i18n module in Subversion has
+ some scripts that help with this task, but it can also easily done
+ using iconv.
 
 7. Adding additional textdomains
 
@@ -214,8 +216,8 @@ this one may not necessarily fit.
 
  Any help with translations is appreciated. If you want to help,
  please get in contact with the people from the GNOME Translation
- Project who coordinate all translation efforts in the GNOME CVS
- tree. They have a nice web-page at
+ Project who coordinate all translation efforts in the GNOME
+ Subversion tree. They have a nice web-page at
 	http://developer.gnome.org/projects/gtp/.
 
 10. And more?
diff --git a/autogen.sh b/autogen.sh
index f94386bfcb..a7d41c3d72 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh 
 
-# This script does all the magic calls to automake/autoconf and
-# friends that are needed to configure a cvs checkout.  As described in
+# This script does all the magic calls to automake/autoconf and friends
+# that are needed to configure a Subversion checkout.  As described in
 # the file HACKING you need a couple of extra tools to run this script
 # successfully.
 #
@@ -75,7 +75,7 @@ check_version ()
 
 echo
 echo "I am testing that you have the tools required to build the"
-echo "$PROJECT from CVS. This test is not foolproof,"
+echo "$PROJECT from Subversion. This test is not foolproof,"
 echo "so if anything goes wrong, see the file HACKING for more information..."
 echo