diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 85653f04e2..c63bd743a7 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -22,15 +22,12 @@ involved in phpBB.
 
 phpBB Lead Developer:  naderman (Nils Adermann)
 
-phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
-                       Arty (Vjacheslav Trushkin)
-                       bantu (Andreas Fischer)
-                       imkingdavid (David King)
+phpBB Developers:      bantu (Andreas Fischer)
                        igorw (Igor Wiedler)
+                       imkingdavid (David King)
                        nickvergessen (Joas Schilling)
                        Oleg (Oleg Pudeyev)
                        rxu (Ruslan Uzdenov)
-                       ToonArmy (Chris Smith)
 
 Contributions by:      leviatan21 (Gabriel Vazquez)
                        Raimon (Raimon Meuldijk)
@@ -39,13 +36,16 @@ Contributions by:      leviatan21 (Gabriel Vazquez)
 
 -- Former Contributors --
 
-phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
+phpBB Project Manager: theFinn (James Atkinson)      [Founder - 04/2007]
                        SHS` (Jonathan Stanley)
 
-phpBB Lead Developer:  psoTFX (Paul S. Owen) [2001 - 09/2005]
+phpBB Lead Developer:  Acyd Burn (Meik Sievertsen)   [09/2005 - 01/2010]
+                       psoTFX (Paul S. Owen)         [2001 - 09/2005]
 
 phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
+                       Acyd Burn (Meik Sievertsen)   [02/2003 - 09/2005]
                        APTX (Marek A. Ruszczyński)   [12/2007 - 04/2011]
+                       Arty (Vjacheslav Trushkin)    [02/2012 - 07/2012]
                        Ashe (Ludovic Arnaud)         [10/2002 - 11/2003, 06/2006 - 10/2006]
                        BartVB (Bart van Bragt)       [11/2000 - 03/2006]
                        ckwalsh (Cullen Walsh)        [01/2010 - 07/2011]
@@ -54,6 +54,7 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                        GrahamJE (Graham Eames)       [09/2005 - 11/2006]
                        kellanved (Henry Sudhof)      [04/2007 - 03/2011]
                        TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
+                       ToonArmy (Chris Smith)        [06/2008 - 11/2011]
                        Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
 
 -- Copyrights --
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 92d72b6636..162b0046b5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4175,7 +4175,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			echo '	</div>';
 			echo '	</div>';
 			echo '	<div id="page-footer">';
-			echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
+			echo '		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
 			echo '	</div>';
 			echo '</div>';
 			echo '</body>';
@@ -5211,7 +5211,7 @@ function page_footer($run_cron = true)
 	$template->assign_vars(array(
 		'DEBUG_OUTPUT'			=> (defined('DEBUG')) ? $debug_output : '',
 		'TRANSLATION_INFO'		=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
-		'CREDIT_LINE'			=> $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
+		'CREDIT_LINE'			=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
 
 		'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '')
 	);
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 2f0188289b..11cc1f6dd8 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -172,7 +172,7 @@ function adm_page_footer($copyright_html = true)
 		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '',
 		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
 		'S_COPYRIGHT_HTML'	=> $copyright_html,
-		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
+		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
 		'T_JQUERY_LINK'		=> ($config['load_jquery_cdn'] && !empty($config['load_jquery_url'])) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery.js",
 		'S_JQUERY_FALLBACK'	=> ($config['load_jquery_cdn']) ? true : false,
 		'VERSION'			=> $config['version'])