diff --git a/ChangeLog b/ChangeLog
index 71e722071..832ed8e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ $HeadURL$
     * libraries/export/csv.php: Fix cvs/csv typo.
     * ChangeLog, libraries/sqlvalidator.class.php: Use HeadURL instead of
       Source keyword.
+    * scripts/setup.php, libraries/sqlparser.lib.php: Remove last CVS
+      mentions.
 
 2006-10-12 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug #1566219, automated timestamp values
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 8043b6af0..b6dd158bf 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -147,7 +147,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
     {
         global $SQP_errorString;
         $debugstr = 'ERROR: ' . $message . "\n";
-        $debugstr .= 'CVS: $Id$' . "\n";
+        $debugstr .= 'SVN: $Id$' . "\n";
         $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
         $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
         $debugstr .= 'PMA: ' . PMA_VERSION . "\n";
diff --git a/scripts/setup.php b/scripts/setup.php
index 8106905ce..d87b19c10 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -9,7 +9,7 @@
  * @author     Michal Čihař <michal@cihar.com>
  * @copyright  2006 Michal Čihař <michal@cihar.com>
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    CVS: $Id$
+ * @version    Subversion $Id$
  */
 /* $Id$ */
 //vim: expandtab sw=4 ts=4 sts=4:
@@ -1865,7 +1865,7 @@ switch ($action) {
             message('notice', 'New version of phpMyAdmin is available, you should consider upgrade. New version is ' . htmlspecialchars($version) . '.');
         } else {
             if ($version_local % 100 == 0) {
-                message('notice', 'You are using CVS version, run <code>cvs update</code> :-). However latest released version is ' . htmlspecialchars($version) . '.');
+                message('notice', 'You are using subversion version, run <code>svn update</code> :-). However latest released version is ' . htmlspecialchars($version) . '.');
             } else {
                 message('notice', 'No newer stable version is available.');
             }