diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3168ead82c..1d704796c3 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -118,6 +118,23 @@
 		<li>[Fix] Correct quote parsing if opening bracket before opening quote (Bug #14667)</li>
 		<li>[Fix] Clean post message for checking length to prevent posting empty messages</li>
 		<li>[Fix] Display jumpbox if needed for functionality (Bug #14702)</li>
+		<li>[Sec] Fixing possible XSS through compromised WHOIS server (#i63, #i64)</li>
+		<li>[Sec] Missing access control on whois in viewonline.php (#i51)</li>
+		<li>[Sec] Encoding some variables within user::page array correctly (to cope with browser not doing it correctly) to prevent XSS through functions re-using them (#i61)</li>
+		<li>[Sec] Fixed XSS through memberlist search feature (#i62)</li>
+		<li>[Sec] Fixed XSS through colour swatch (#i65)</li>
+		<li>[Sec] Fixed insecure attachment deletion (#i53)</li>
+		<li>[Sec] Only allow whitelisted protocols in meta_redirect/redirect (#i66)</li>
+		<li>[Sec] Check file names to be written in language management panel (#i52)</li>
+		<li>[Sec] Deregister globals if ini_get has been disabled (#i112)</li>
+		<li>[Sec] Added form tokens to most forms to enforce a lighter variant of CSRF protection (#i91 - #i96)</li>
+		<li>[Sec] Use new password hash method for forum passwords (#i43)</li>
+		<li>[Sec] Changed download file location to prevent flash crossdomain policies taking effect (#i8)</li>
+		<li>[Sec] Do not allow autocompletion for password on admin re-authentication (#i41)</li>
+		<li>[Sec] Made sure users are not completely locked out if they have a GLOBALS cookie (#i101)</li>
+		<li>[Sec] Use the secure hash to generate BBCODE_UIDs (#i71)</li>
+		<li>[Sec] Increase the length of BBCODE_UIDs (#i72)</li>
+		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
 	<a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3>
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 9992b94aa7..0c060a83dd 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -31,7 +31,7 @@ unset($dbpasswd);
 */
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
-	'version'		=> '1.0.RC5',
+	'version'		=> '1.0.RC6',
 	'phpbb_version'	=> '3.0.0',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 96e91f9883..64f947783c 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -213,7 +213,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC6-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC6');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');