diff --git a/ChangeLog b/ChangeLog
index 5cddc928a..eb12f0821 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-04-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * changelog.php:
+      link also js, html, pl, and sh files, FAQ entries
+      and contributors to their sf.net user page, smaller regex fixes
+
 2006-04-13 Marc Delisle  <lem9@users.sourceforge.net>
     * export.php: bug #1443004 part 2: export views after the tables
 
diff --git a/changelog.php b/changelog.php
index 9dd53e22b..4c4d49670 100644
--- a/changelog.php
+++ b/changelog.php
@@ -10,29 +10,42 @@
 $changelog = htmlspecialchars(file_get_contents('ChangeLog'));
 
 $replaces = array(
-    // sourceforge addresses
+    // sourceforge users
     '/([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>',
+    '/thanks to ([^\(\r\n]+) -\s+([-\w]+)/i'
+    => '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>',
 
-    // linking bugs
-    '/bug\s+#([0-9]*)/i'
-    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377408">bug \\1</a>',
-
-    // linking pacthes
-    '/patch\s+#([0-9]*)/i'
-    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377410">patch \\1</a>',
+    // linking patches
+    '/patch\s*#?([0-9]{6,})/i'
+    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377410">patch #\\1</a>',
 
     // linking RFE
-    '/rfe\s+#([0-9]*)/i'
-    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377411">RFE \\1</a>',
+    '/(?:rfe|feature)\s*#?([0-9]{6,})/i'
+    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377411">RFE #\\1</a>',
 
     // linking files
-    '/(\s+)([\\/a-z_0-9\.]+\.php)/i'
+    '/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i'
     => '\\1<a href="http://cvs.sourceforge.net/viewcvs.py/phpmyadmin/phpMyAdmin/\\2?annotate=HEAD">\\2</a>',
+
+    // FAQ entries
+    '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
+    => '<a href="http://localhost/phpMyAdmin/Documentation.html#faq\\1_\\2">FAQ \\1.\\2</a>',
+
+    // linking bugs
+    '/bug\s*#?([0-9]{6,})/i'
+    => '<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377408">BUG #\\1</a>',
+
+    // all other 6+ digit numbers are treated as bugs
+    '/(?<!BUG|RFE|patch) #?([0-9]{6,})/i'
+    => ' <a href="https://sourceforge.net/tracker/index.php?func=detail&aid=\\1&amp;group_id=23067&amp;atid=377408">BUG #\\1</a>',
+
 );
 
 header('Content-type: text/html; charset=utf-8');