diff --git a/ChangeLog b/ChangeLog
index b9e4d43bf..a8da9a188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
     * scripts/create-release.sh: Readd snapshot support.
     * libraries/cleanup.lib.php, libraries/common.lib.php: Move cleanup to
       separate function (bug #1569123).
+    * changelog.php: Switch to subversion.
 
 2006-10-12 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug #1566219, automated timestamp values
diff --git a/changelog.php b/changelog.php
index 63e512629..1ced513a1 100644
--- a/changelog.php
+++ b/changelog.php
@@ -34,7 +34,7 @@ $replaces = array(
 
     // linking files
     '/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i'
-    => '\\1<a href="http://phpmyadmin.cvs.sourceforge.net/phpmyadmin/phpMyAdmin/\\2?annotate=HEAD">\\2</a>',
+    => '\\1<a href="http://svn.sourceforge.net/viewvc/phpmyadmin/trunk/phpMyAdmin/\\2?annotate=HEAD">\\2</a>',
 
     // FAQ entries
     '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
@@ -54,9 +54,9 @@ $replaces = array(
 
     // Highlight releases (with links)
     '/((    ### )(([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+) (.*)))/'
-    => '<a name="\\4_\\5_\\6_\\7"></a>\\2<a href="http://phpmyadmin.cvs.sourceforge.net/phpmyadmin/phpMyAdmin/?only_with_tag=RELEASE_\\4_\\5_\\6_\\7">\\4.\\5.\\6.\\7 \\8</a>',
+    => '<a name="\\4_\\5_\\6_\\7"></a>\\2<a href="http://svn.sourceforge.net/viewvc/phpmyadmin/tags/RELEASE_\\4_\\5_\\6_\\7/phpMyAdmin">\\4.\\5.\\6.\\7 \\8</a>',
     '/((    ### )(([0-9]+)\.([0-9]+)\.([0-9]+) (.*)))/'
-    => '<a name="\\4_\\5_\\6"></a>\\2<a href="http://phpmyadmin.cvs.sourceforge.net/phpmyadmin/phpMyAdmin/?only_with_tag=RELEASE_\\4_\\5_\\6">\\4.\\5.\\6 \\7</a>',
+    => '<a name="\\4_\\5_\\6_\\7"></a>\\2<a href="http://svn.sourceforge.net/viewvc/phpmyadmin/tags/RELEASE_\\4_\\5_\\6/phpMyAdmin">\\4.\\5.\\6 \\7</a>',
 
     // Highlight releases (not linkable)
     '/(    ### )(.*)/'