diff --git a/ChangeLog b/ChangeLog
index 2e42d7588..fecafabd5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,8 @@ $Source$
     * libraries/url_generating.lib.php, libraries/session.inc.php,
       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.
+    * changelog.php: Link to CAN/CVE security issues, highlight releases, fix
+      email links.
 
 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 4946b510b..7636d084b 100644
--- a/changelog.php
+++ b/changelog.php
@@ -11,7 +11,7 @@ $changelog = htmlspecialchars(file_get_contents('ChangeLog'));
 
 $replaces = array(
     // sourceforge users
-    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+) &lt;(.*)@users.sourceforge.net&gt;/i'
+    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*)@users.sourceforge.net&gt;/i'
     => '\\1 <a href="https://sourceforge.net/users/\\3/">\\2</a>',
     '/thanks to ([^\(\r\n]+) \(([-\w]+)\)/i'
     => 'thanks to <a href="https://sourceforge.net/users/\\2/">\\1</a>',
@@ -19,8 +19,8 @@ $replaces = array(
     => 'thanks to <a href="https://sourceforge.net/users/\\2/">\\1</a>',
 
     // mail adresse
-    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+) &lt;(.*@.*)&gt;/i'
-    => '\\1 <a href="mailto:\\3/">\\2</a>',
+    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*@.*)&gt;/i'
+    => '\\1 <a href="mailto:\\3">\\2</a>',
 
     // linking patches
     '/patch\s*#?([0-9]{6,})/i'