diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 9fc30afeed..f570573ea8 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -159,6 +159,7 @@
 		<li>[Fix] Do not allow setting group as default group for pending user (Bug #45675 - Patch by nickvergessen)</li>
 		<li>[Fix] Fail gracefully if store folder is not writable during update. (Bugs #46615, #46945)</li>
 		<li>[Fix] Correct escaping/unescaping in the LDAP authentication plugin. (Bug #48175)</li>
+		<li>[Fix] Add hard limit for smilies.</li>
 		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
 		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
 		<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 2e2c239d89..2173f2ee68 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -161,6 +161,9 @@ define('BBCODE_UID_LEN', 8);
 // Number of core BBCodes
 define('NUM_CORE_BBCODES', 12);
 
+// Smiley hard limit
+define('SMILEY_LIMIT', 1000);
+
 // Magic url types
 define('MAGIC_URL_EMAIL', 1);
 define('MAGIC_URL_FULL', 2);
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index cfb626d186..1a2be20018 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -180,6 +180,8 @@ $lang = array_merge($lang, array(
 	'SMILIES_URL'				=> 'Smiley image file',
 	'SMILIES_WIDTH'				=> 'Smiley width',
 
+	'TOO_MANY_SMILIES'			=> 'Limit of %d smilies reached.',
+
 	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
 ));