diff --git a/RELEASE-NOTES-1.39 b/RELEASE-NOTES-1.39
index 0330f236a7d..ff6ca164e3b 100644
--- a/RELEASE-NOTES-1.39
+++ b/RELEASE-NOTES-1.39
@@ -87,6 +87,11 @@ MediaWiki supports over 350 languages. Many localisations are updated regularly.
 Below only new and removed languages are listed, as well as changes to languages
 because of Phabricator reports.
 
+* (T304920) In Swahili, The "Media" namespace is now "Media", as in English,
+  and the "File" namespace is now "Faili". The old name of the "File" namespace
+  was "Picha", and it's kept for backwards compatibility. If you manage a wiki
+  in Swahili, and you use "Faili:" as a namespace anywhere in wikitext, and
+  you mean to use it as "Media:", these need to be replaced to "Media:".
 * …
 
 === Breaking changes in 1.39 ===
@@ -123,6 +128,8 @@ because of Phabricator reports.
 * Changes to ResourceLoader modules:
   - The mediawiki.viewport module, deprecated in 1.37 has been
      removed. Use IntersectionObserver instead.
+* If you manage a wiki in Swahili, and you use "Faili:" as a namespace anywhere,
+  and you mean to use it as "Media:", replace it with "Media:". See T304920.
 * Changes to skins:
   - Skin::getCopyrightIcon(), ::getPoweredBy(), deprecated in 1.37 have been
     removed.
diff --git a/languages/messages/MessagesSw.php b/languages/messages/MessagesSw.php
index c03204e6d0a..ee54f136aa6 100644
--- a/languages/messages/MessagesSw.php
+++ b/languages/messages/MessagesSw.php
@@ -20,13 +20,12 @@
  */
 
 $namespaceNames = [
-	NS_MEDIA            => 'Faili',
 	NS_SPECIAL          => 'Maalum',
 	NS_TALK             => 'Majadiliano',
 	NS_USER             => 'Mtumiaji',
 	NS_USER_TALK        => 'Majadiliano_ya_mtumiaji',
 	NS_PROJECT_TALK     => 'Majadiliano_ya_$1',
-	NS_FILE             => 'Picha',
+	NS_FILE             => 'Faili',
 	NS_FILE_TALK        => 'Majadiliano_ya_faili',
 	NS_MEDIAWIKI_TALK   => 'Majadiliano_ya_MediaWiki',
 	NS_TEMPLATE         => 'Kigezo',
@@ -38,6 +37,7 @@ $namespaceNames = [
 ];
 
 $namespaceAliases = [
+	'Picha'                 => NS_FILE,
 	'$1_majadiliano'        => NS_PROJECT_TALK,
 	'Majadiliano_faili'     => NS_FILE_TALK,
 	'MediaWiki_majadiliano' => NS_MEDIAWIKI_TALK,