diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index e62833ed13..067db48e3a 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -98,6 +98,8 @@ p,ul,td {font-size:10pt;}
 <li>Deleted doubled 'U_MEMBERLIST' assignment from page_header.php</li>
 <li>Fixed wrong display of Signature Checkbox while editing Private Message</li>
 <li>Fixed disappearing post text if emoticon was inserted directly after pressing a BBCode button</li>
+<li>Display correct alt-tag for smilies within postings - emoticon instead of filename</li>
+<li>Prevented the ability to apply BBCode to website contents - we will find another EasterEgg</li>
 </ul>
 
 <a name="203"></a><h3 class="h3">1.ii. Changes since 2.0.3</h3>
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 20ef81f0a6..bd1d3db10c 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -744,7 +744,7 @@ function smilies_pass($message)
 		global $db, $board_config;
 		$orig = $repl = array();
 
-		$sql = 'SELECT code, smile_url FROM ' . SMILIES_TABLE;
+		$sql = 'SELECT * FROM ' . SMILIES_TABLE;
 		if( !$result = $db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
@@ -759,7 +759,7 @@ function smilies_pass($message)
 		for ($i = 0; $i < count($smilies); $i++)
 		{
 			$orig[] = "/(?<=.\W|\W.|^\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/";
-			$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0" />';
+			$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['emoticon'] . '" border="0" />';
 		}
 	}
 
diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl
index a89e160783..e8700a5e7d 100644
--- a/phpBB/templates/subSilver/posting_body.tpl
+++ b/phpBB/templates/subSilver/posting_body.tpl
@@ -135,6 +135,7 @@ function bbfontstyle(bbopen, bbclose) {
 function bbstyle(bbnumber) {
 	var txtarea = document.post.message;
 
+	txtarea.focus();
 	donotinsert = false;
 	theSelection = false;
 	bblast = 0;