diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 2c8661010a..cd32cc2e22 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -96,6 +96,7 @@
 		<li>[Fix] Show correct HTML title when reporting private messages. (Bug #54375)</li>
 		<li>[Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)</li>
 		<li>[Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)</li>
+		<li>[Fix] Make word censoring case insensitive. (Bug #54265)</li>
 		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
 		<li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li>
 	</ul>
diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index 1effada666..a0142292ed 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -86,7 +86,7 @@ class cache extends acm
 			{
 				if ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false)
 				{
-					$censors['match'][] = '#(?<![\p{Nd}\p{L}_])(' . str_replace('\*', '[\p{Nd}\p{L}_]*?', preg_quote($row['word'], '#')) . ')(?![\p{Nd}\p{L}_])#u';
+					$censors['match'][] = '#(?<![\p{Nd}\p{L}_])(' . str_replace('\*', '[\p{Nd}\p{L}_]*?', preg_quote($row['word'], '#')) . ')(?![\p{Nd}\p{L}_])#iu';
 				}
 				else
 				{