diff --git a/ChangeLog b/ChangeLog
index fecafabd5..33e4c17db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ $Source$
       libraries/common.lib.php: Protect against external links which could
       perform any action (CVE-2006-1804).
     * changelog.php: Link to CAN/CVE security issues, highlight releases, fix
-      email links.
+      email links, link releases to tags in CVS.
 
 2006-04-13 Marc Delisle  <lem9@users.sourceforge.net>
     * server_databases.php: need brackets for correct calculation of page
diff --git a/changelog.php b/changelog.php
index 7636d084b..2f2ce5779 100644
--- a/changelog.php
+++ b/changelog.php
@@ -4,7 +4,6 @@
  * Simple script to set correct charset for changelog
  *
  * @id      $Id$
- * @todo    link release tags
  */
 
 $changelog = htmlspecialchars(file_get_contents('ChangeLog'));
@@ -50,7 +49,13 @@ $replaces = array(
     '/((CAN|CVE)-[0-9]+-[0-9]+)/'
     => '<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
 
-    // Highlight releases
+    // Highlight releases (with links)
+    '/((    ### )(([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+) (.*)))/'
+    => '<a name="\\4_\\5_\\6_\\7"></a>\\2<a href="http://cvs.sourceforge.net/viewcvs.py/phpmyadmin/phpMyAdmin/?only_with_tag=RELEASE_\\4_\\5_\\6_\\7">\\4.\\5.\\6.\\7 \\8</a>',
+    '/((    ### )(([0-9]+)\.([0-9]+)\.([0-9]+) (.*)))/'
+    => '<a name="\\4_\\5_\\6"></a>\\2<a href="http://cvs.sourceforge.net/viewcvs.py/phpmyadmin/phpMyAdmin/?only_with_tag=RELEASE_\\4_\\5_\\6">\\4.\\5.\\6 \\7</a>',
+    
+    // Highlight releases (not linkable)
     '/(    ### )(.*)/'
     => '\\1<b>\\2</b>',