diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index fd0718f6cb..06717e6385 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -32,6 +32,7 @@ p,ul,td {font-size:10pt;}
 <ol>
 <li><a href="#changelog">Changelog</a></li>
 <ol type="i">
+	<li><a href="#2023">Changes since 2.0.23</a></li>
 	<li><a href="#2022">Changes since 2.0.22</a></li>
 	<li><a href="#2021">Changes since 2.0.21</a></li>
 	<li><a href="#2020">Changes since 2.0.20</a></li>
@@ -68,7 +69,13 @@ p,ul,td {font-size:10pt;}
 
 <p>This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.</p>
 
-<a name="2022"></a><h3 class="h3">l.i. Changes since 2.0.22</h3>
+<a name="2023"></a><h3 class="h3">l.i. Changes since 2.0.23</h3>
+
+<ul>
+<li>[Fix] Only insert words into search match table not being tagged as common (Bug #2591) - patch provided by tigertech</li>
+</ul>
+
+<a name="2022"></a><h3 class="h3">l.ii. Changes since 2.0.22</h3>
 
 <ul>
 <li>[Fix] Correctly re-assign group moderator on user deletion (Bug #280)</li>
@@ -87,7 +94,7 @@ p,ul,td {font-size:10pt;}
 <li>[Fix] Fixing some problems with PHP5 and register_long_arrays off</li>
 </ul>
 
-<a name="2021"></a><h3 class="h3">l.ii. Changes since 2.0.21</h3>
+<a name="2021"></a><h3 class="h3">l.iii. Changes since 2.0.21</h3>
 
 <ul>
 <li>[Fix] Check for user's existence prior to showing email form</li>
@@ -103,7 +110,7 @@ p,ul,td {font-size:10pt;}
 <li>[Sec] Added session checks to various forms - kellanved</li>
 </ul>
 
-<a name="2020"></a><h3 class="h3">l.iii. Changes since 2.0.20</h3>
+<a name="2020"></a><h3 class="h3">l.iv. Changes since 2.0.20</h3>
 
 <ul>
 <li>[Fix] Changes to random number generator code to explicitly truncate the length of the string</li>
@@ -120,7 +127,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2019"></a><h3 class="h3">l.iv. Changes since 2.0.19</h3>
+<a name="2019"></a><h3 class="h3">l.v. Changes since 2.0.19</h3>
 
 <ul>
 <li>[Fix] Prevent login attempts from incrementing for inactive users</li>
@@ -153,7 +160,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2018"></a><h3 class="h3">l.v. Changes since 2.0.18</h3>
+<a name="2018"></a><h3 class="h3">l.vi. Changes since 2.0.18</h3>
 
 <ul>
 <li>[Fix] corrected index on session keys table under MS SQL</li>
@@ -172,7 +179,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2017"></a><h3 class="h3">l.vi. Changes since 2.0.17</h3>
+<a name="2017"></a><h3 class="h3">l.vii. Changes since 2.0.17</h3>
 
 <ul>
 <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
@@ -220,7 +227,7 @@ p,ul,td {font-size:10pt;}
 <li>[Sec] compare imagetype on avatar uploading to match the file extension from uploaded file</li>
 </ul>
 
-<a name="2016"></a><h3 class="h3">l.vii. Changes since 2.0.16</h3>
+<a name="2016"></a><h3 class="h3">l.viii. Changes since 2.0.16</h3>
 
 <ul>
 <li>Added extra checks to the deletion code in privmsg.php - reported by party_fan</li>
@@ -236,7 +243,7 @@ p,ul,td {font-size:10pt;}
 <li>Correctly set username on posts when deleting a user from the admin panel</li>
 </ul>
 
-<a name="2015"></a><h3 class="h3">l.viii. Changes since 2.0.15</h3>
+<a name="2015"></a><h3 class="h3">l.ix. Changes since 2.0.15</h3>
 
 <ul>
 <li>Fixed critical issue with highlighting - <b>Discovered and fix provided by Ron van Daal</b></li>
@@ -248,7 +255,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed bug in admin re-authentication redirect for servers not having index.php as one of their default files set</li>
 </ul>
 
-<a name="2014"></a><h3 class="h3">l.ix. Changes since 2.0.14</h3>
+<a name="2014"></a><h3 class="h3">l.x. Changes since 2.0.14</h3>
 
 <ul>
 <li>Fixed moderator status removal in groupcp.php</li>
@@ -270,7 +277,7 @@ p,ul,td {font-size:10pt;}
 <li>Empty url/img bbcodes no longer get parsed</li>
 </ul>
 
-<a name="2013"></a><h3 class="h3">l.x. Changes since 2.0.13</h3>
+<a name="2013"></a><h3 class="h3">l.xi. Changes since 2.0.13</h3>
 
 <ul>
 <li>Hardened author and keyword search a bit to not allow very server intensive searches</li>
@@ -287,7 +294,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed case-sensitivity issues in postgres7.php - <b>R45</b></li>
 </ul>
 
-<a name="2012"></a><h3 class="h3">l.xi. Changes since 2.0.12</h3>
+<a name="2012"></a><h3 class="h3">l.xii. Changes since 2.0.12</h3>
 
 <ul>
 <li>Ommitted preg_replace warning in viewtopic due to improper working of preg_quote in PHP - originally reported by matrix_killer, fix submitted by another party</li>
@@ -295,7 +302,7 @@ p,ul,td {font-size:10pt;}
 <li>Minimum requirements raised to PHP 4.0.3 or above due to fixing vulnerability issues breaking PHP3 compatibility.</li>
 </ul>
 
-<a name="2011"></a><h3 class="h3">l.xii. Changes since 2.0.11</h3>
+<a name="2011"></a><h3 class="h3">l.xiii. Changes since 2.0.11</h3>
 
 <ul>
 <li>Added confirm table to admin_db_utilities.php</li>
@@ -310,7 +317,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed path disclosure bug in viewtopic.php caused by a PHP 4.3.10 bug - <b>matrix_killer</b></li>
 </ul>
 
-<a name="2010"></a><h3 class="h3">l.xiii. Changes since 2.0.10</h3>
+<a name="2010"></a><h3 class="h3">l.xiv. Changes since 2.0.10</h3>
 
 <ul>
 <li>Fixed vulnerability in highlighting code (<b>very high severity, please update your installation as soon as possible</b>)</li>
@@ -321,7 +328,7 @@ p,ul,td {font-size:10pt;}
 <li>Added visual confirmation mod to code base</li>
 </ul>
 
-<a name="209"></a><h3 class="h3">l.xiv. Changes since 2.0.9</h3>
+<a name="209"></a><h3 class="h3">l.xv. Changes since 2.0.9</h3>
 
 <ul>
 <li>Fixed deleting of styles in admin_styles.php</li>
@@ -334,7 +341,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed visual confirmation code. The image was not created due to a wrong regular expression.</li>
 </ul>
 
-<a name="208"></a><h3 class="h3">l.xv. Changes since 2.0.8</h3>
+<a name="208"></a><h3 class="h3">l.xvi. Changes since 2.0.8</h3>
 
 <ul>
 <li>Fixed one vulnerability in admin_board.php - <b>Xore</b></li>
@@ -353,7 +360,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed problem with SID not delivered to next page in groupcp.php</li>
 </ul>
 
-<a name="207"></a><h3 class="h3">l.xvi. Changes since 2.0.7</h3>
+<a name="207"></a><h3 class="h3">l.xvii. Changes since 2.0.7</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in admin pages</li>
@@ -365,7 +372,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed sql injection vulnerability in privmsg - 2.0.8a</li>
 </ul>
 
-<a name="206"></a><h3 class="h3">1.xvii. Changes since 2.0.6</h3>
+<a name="206"></a><h3 class="h3">1.xviii. Changes since 2.0.6</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in modcp - <b>Robert Lavierck</b></li>
@@ -379,7 +386,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential vulnerability in avatar gallery</li>
 </ul>
 
-<a name="205"></a><h3 class="h3">1.xviii. Changes since 2.0.5</h3>
+<a name="205"></a><h3 class="h3">1.xix. Changes since 2.0.5</h3>
 
 <ul>
 <li>Fixed various email issues</li>
@@ -395,7 +402,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed sql injection with reset date format field in profile - <b>tendor</b></li>
 </ul>
 
-<a name="204"></a><h3 class="h3">1.xix. Changes since 2.0.4</h3>
+<a name="204"></a><h3 class="h3">1.xx. Changes since 2.0.4</h3>
 
 <ul>
 <li>Removed user facing session_id checks</li>
@@ -467,7 +474,7 @@ p,ul,td {font-size:10pt;}
 <li>Default English support for visual confirmation - translators are encouraged to support this</li>
 </ul>
 
-<a name="203"></a><h3 class="h3">1.xx. Changes since 2.0.3</h3>
+<a name="203"></a><h3 class="h3">1.xxi. Changes since 2.0.3</h3>
 
 <ul>
 <li>Fixed cross-browser scripting issue with highlight param</li>
@@ -594,7 +601,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential SQL vulnerability with marking of private messages - <b>Ulf Harnhammar</b></li>
 </ul>
 
-<a name="202"></a><h3 class="h3">1.xxi. Changes since 2.0.2</h3>
+<a name="202"></a><h3 class="h3">1.xxii. Changes since 2.0.2</h3>
 
 <ul>
 <li>Fixed potential cross-site scripting vulnerability with avatars - <b>Showscout</b></li>
@@ -603,7 +610,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed (hopefully) issue with MS Access and multiple pages</li>
 </ul>
 
-<a name="201"></a><h3 class="h3">1.xxii. Changes since 2.0.1</h3>
+<a name="201"></a><h3 class="h3">1.xxiii. Changes since 2.0.1</h3>
 
 <ul>
 <li>Fixed missing "username" lang variable in user admin template</li>
@@ -638,7 +645,7 @@ p,ul,td {font-size:10pt;}
 <li>Fix emailer to allow sending emails with language-specific character sets</li>
 </ul>
 
-<a name="200"></a><h3 class="h3">1.xxiii. Changes since 2.0.0</h3>
+<a name="200"></a><h3 class="h3">1.xxiv. Changes since 2.0.0</h3>
 
 <ul>
 <li>Fixed delete image bug for normal users</li>
@@ -695,7 +702,7 @@ p,ul,td {font-size:10pt;}
 <li>Added database closure to admin frameset page</li>
 </ul>
 
-<a name="final"></a><h3 class="h3">1.xxiv. Changes since RC-4</h3>
+<a name="final"></a><h3 class="h3">1.xxv. Changes since RC-4</h3>
 
 <ul>
 <li>Fixed improper report of general error when posting messages containing errors</li>
@@ -725,7 +732,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed various remaining usergroup display issues</li>
 </ul>
 
-<a name="rc4"></a><h3 class="h3">1.xxv. Changes since RC-3</h3>
+<a name="rc4"></a><h3 class="h3">1.xxvi. Changes since RC-3</h3>
 
 <ul>
 <li>Addressed serious security issue with included files</li>
@@ -756,7 +763,7 @@ p,ul,td {font-size:10pt;}
 <li>Fix (hopefully) remaining ICQ overlay issue with view profile in subSilver</li>
 </ul>
 
-<a name="rc3"></a><h3 class="h3">1.xxvi. Changes since RC-2</h3>
+<a name="rc3"></a><h3 class="h3">1.xxvii. Changes since RC-2</h3>
 
 <ul>
 <li>Fixed infamous install parse error</li>
@@ -789,7 +796,7 @@ p,ul,td {font-size:10pt;}
 <li>Hidden usergroups are now completely hidden from view</li>
 </ul>
 
-<a name="rc2"></a><h3 class="h3">1.xxvii. Changes since RC-1</h3>
+<a name="rc2"></a><h3 class="h3">1.xxviii. Changes since RC-1</h3>
 
 <ul>
 <li>Fixed numerous PostgreSQL related issues</li>
@@ -809,7 +816,7 @@ p,ul,td {font-size:10pt;}
 <li>Various other fixes and updates</li>
 </ul>
 
-<a name="rc1"></a><h3 class="h3">1.xxviii. Changes since RC-1 (pre)</h3>
+<a name="rc1"></a><h3 class="h3">1.xxix. Changes since RC-1 (pre)</h3>
 
 <ul>
 <li>Upgrade script completed for initial fully functional release</li>
diff --git a/phpBB/includes/functions_search.php b/phpBB/includes/functions_search.php
index 277a8563de..6b90aba264 100644
--- a/phpBB/includes/functions_search.php
+++ b/phpBB/includes/functions_search.php
@@ -245,7 +245,8 @@ function add_search_words($mode, $post_id, $post_text, $post_title = '')
 			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
 				SELECT $post_id, word_id, $title_match  
 					FROM " . SEARCH_WORD_TABLE . " 
-					WHERE word_text IN ($match_sql)"; 
+					WHERE word_text IN ($match_sql)
+					AND word_common <> 1";
 			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);