diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index acec7e71fd..dd950f797b 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="#2021">Changes since 2.0.21</a></li>
 	<li><a href="#2020">Changes since 2.0.20</a></li>
 	<li><a href="#2019">Changes since 2.0.19</a></li>
 	<li><a href="#2018">Changes since 2.0.18</a></li>
@@ -66,7 +67,23 @@ 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="2020"></a><h3 class="h3">l.i. Changes since 2.0.20</h3>
+<a name="2021"></a><h3 class="h3">l.i. Changes since 2.0.21</h3>
+
+<ul>
+<li>[Fix] Check for user's existence prior to showing email form</li>
+<li>[Fix] New members of moderator groups should always become moderators (Bug #382)</li>
+<li>[Fix] Proper message when replying to non-existant topics (Bug #459)</li>
+<li>[Fix] Changed column type of search_array to store more ids (Bug #4058)</li>
+<li>[Fix] Fixed annoyance with font-size selector (Bug #4612)</li>
+<li>[Fix] Fix optimize line in database updater (Bug #6186)</li>
+<li>[Sec] Check for the avatar upload directory reinforced</li>
+<li>[Sec] Changes to the criteria for "bad" redirection targets - kellanved</li>
+<li>[Sec] Fixed a non-persistent XSS issue in private messaging</li>
+<li>[Sec] Fixing possible negative start parameter - SpiderZ.</li>
+<li>[Sec] Added session checks to various forms - kellanved</li>
+</ul>
+
+<a name="2020"></a><h3 class="h3">l.ii. Changes since 2.0.20</h3>
 
 <ul>
 <li>[Fix] Changes to random number generator code to explicitly truncate the length of the string</li>
@@ -83,7 +100,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2019"></a><h3 class="h3">l.ii. Changes since 2.0.19</h3>
+<a name="2019"></a><h3 class="h3">l.iii. Changes since 2.0.19</h3>
 
 <ul>
 <li>[Fix] Prevent login attempts from incrementing for inactive users</li>
@@ -116,7 +133,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2018"></a><h3 class="h3">l.iii. Changes since 2.0.18</h3>
+<a name="2018"></a><h3 class="h3">l.iv. Changes since 2.0.18</h3>
 
 <ul>
 <li>[Fix] corrected index on session keys table under MS SQL</li>
@@ -135,7 +152,7 @@ p,ul,td {font-size:10pt;}
 </ul>
 
 
-<a name="2017"></a><h3 class="h3">l.iv. Changes since 2.0.17</h3>
+<a name="2017"></a><h3 class="h3">l.v. Changes since 2.0.17</h3>
 
 <ul>
 <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
@@ -183,7 +200,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.v. Changes since 2.0.16</h3>
+<a name="2016"></a><h3 class="h3">l.vi. Changes since 2.0.16</h3>
 
 <ul>
 <li>Added extra checks to the deletion code in privmsg.php - reported by party_fan</li>
@@ -199,7 +216,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.vi. Changes since 2.0.15</h3>
+<a name="2015"></a><h3 class="h3">l.vii. Changes since 2.0.15</h3>
 
 <ul>
 <li>Fixed critical issue with highlighting - <b>Discovered and fix provided by Ron van Daal</b></li>
@@ -211,7 +228,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.vii. Changes since 2.0.14</h3>
+<a name="2014"></a><h3 class="h3">l.viii. Changes since 2.0.14</h3>
 
 <ul>
 <li>Fixed moderator status removal in groupcp.php</li>
@@ -233,7 +250,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.viii. Changes since 2.0.13</h3>
+<a name="2013"></a><h3 class="h3">l.ix. Changes since 2.0.13</h3>
 
 <ul>
 <li>Hardened author and keyword search a bit to not allow very server intensive searches</li>
@@ -250,7 +267,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.ix. Changes since 2.0.12</h3>
+<a name="2012"></a><h3 class="h3">l.x. 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>
@@ -258,7 +275,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.x. Changes since 2.0.11</h3>
+<a name="2011"></a><h3 class="h3">l.xi. Changes since 2.0.11</h3>
 
 <ul>
 <li>Added confirm table to admin_db_utilities.php</li>
@@ -273,7 +290,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.xi. Changes since 2.0.10</h3>
+<a name="2010"></a><h3 class="h3">l.xii. 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>
@@ -284,7 +301,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.xii. Changes since 2.0.9</h3>
+<a name="209"></a><h3 class="h3">l.xiii. Changes since 2.0.9</h3>
 
 <ul>
 <li>Fixed deleting of styles in admin_styles.php</li>
@@ -297,7 +314,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.xiii. Changes since 2.0.8</h3>
+<a name="208"></a><h3 class="h3">l.xiv. Changes since 2.0.8</h3>
 
 <ul>
 <li>Fixed one vulnerability in admin_board.php - <b>Xore</b></li>
@@ -316,7 +333,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.xiv. Changes since 2.0.7</h3>
+<a name="207"></a><h3 class="h3">l.xv. Changes since 2.0.7</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in admin pages</li>
@@ -328,7 +345,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.xv. Changes since 2.0.6</h3>
+<a name="206"></a><h3 class="h3">1.xvi. Changes since 2.0.6</h3>
 
 <ul>
 <li>Fixed several vulnerabilities in modcp - <b>Robert Lavierck</b></li>
@@ -342,7 +359,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential vulnerability in avatar gallery</li>
 </ul>
 
-<a name="205"></a><h3 class="h3">1.xvi. Changes since 2.0.5</h3>
+<a name="205"></a><h3 class="h3">1.xvii. Changes since 2.0.5</h3>
 
 <ul>
 <li>Fixed various email issues</li>
@@ -358,7 +375,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.xvii. Changes since 2.0.4</h3>
+<a name="204"></a><h3 class="h3">1.xviii. Changes since 2.0.4</h3>
 
 <ul>
 <li>Removed user facing session_id checks</li>
@@ -430,7 +447,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.xviii. Changes since 2.0.3</h3>
+<a name="203"></a><h3 class="h3">1.xix. Changes since 2.0.3</h3>
 
 <ul>
 <li>Fixed cross-browser scripting issue with highlight param</li>
@@ -557,7 +574,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.xix. Changes since 2.0.2</h3>
+<a name="202"></a><h3 class="h3">1.xx. Changes since 2.0.2</h3>
 
 <ul>
 <li>Fixed potential cross-site scripting vulnerability with avatars - <b>Showscout</b></li>
@@ -566,7 +583,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.xx. Changes since 2.0.1</h3>
+<a name="201"></a><h3 class="h3">1.xxi. Changes since 2.0.1</h3>
 
 <ul>
 <li>Fixed missing "username" lang variable in user admin template</li>
@@ -601,7 +618,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.xxi. Changes since 2.0.0</h3>
+<a name="200"></a><h3 class="h3">1.xxii. Changes since 2.0.0</h3>
 
 <ul>
 <li>Fixed delete image bug for normal users</li>
@@ -658,7 +675,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.xxii. Changes since RC-4</h3>
+<a name="final"></a><h3 class="h3">1.xxiii. Changes since RC-4</h3>
 
 <ul>
 <li>Fixed improper report of general error when posting messages containing errors</li>
@@ -688,7 +705,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed various remaining usergroup display issues</li>
 </ul>
 
-<a name="rc4"></a><h3 class="h3">1.xxiii. Changes since RC-3</h3>
+<a name="rc4"></a><h3 class="h3">1.xxiv. Changes since RC-3</h3>
 
 <ul>
 <li>Addressed serious security issue with included files</li>
@@ -719,7 +736,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.xxiv. Changes since RC-2</h3>
+<a name="rc3"></a><h3 class="h3">1.xxv. Changes since RC-2</h3>
 
 <ul>
 <li>Fixed infamous install parse error</li>
@@ -752,7 +769,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.xxv. Changes since RC-1</h3>
+<a name="rc2"></a><h3 class="h3">1.xxvi. Changes since RC-1</h3>
 
 <ul>
 <li>Fixed numerous PostgreSQL related issues</li>
@@ -772,7 +789,7 @@ p,ul,td {font-size:10pt;}
 <li>Various other fixes and updates</li>
 </ul>
 
-<a name="rc1"></a><h3 class="h3">1.xxvi. Changes since RC-1 (pre)</h3>
+<a name="rc1"></a><h3 class="h3">1.xxvii. Changes since RC-1 (pre)</h3>
 
 <ul>
 <li>Upgrade script completed for initial fully functional release</li>