diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9059352bb7..fbdd236c7b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2812,7 +2812,7 @@ function smiley_text($text, $force_option = false)
 	}
 	else
 	{
-		return str_replace('<img src="{SMILIES_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $text);
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text);
 	}
 }