diff --git a/CHANGELOG.md b/CHANGELOG.md
index eaab25ba..4c8c6eb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,10 +9,10 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2
 ### Added
 - Address book encryption
 - The device authentication feature on the Zashi app launch has been added
-- Zashi app now supports Spanish language
+- Zashi app now supports Spanish language. It can be changed in the System settings options.
 - The Flexa SDK has been adopted to enable payments using the embedded Flexa UI
 - New Sending, Success, Failure, and GrpcFailure subscreens of the Send Confirmation screen have been added
-- New Copy Transaction IDs feature has been added to the MultipleTransactionFailure screen 
+- New Copy Transaction IDs feature has been added to the MultipleTransactionFailure screen
 
 ### Changed
 - Shielded transactions are properly indicated in transaction history
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 029a0ac4..f504166d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher_square"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:localeConfig="@xml/locales_config"
         android:label="@string/app_name">
 
         <!-- Alias acts as the entrypoint to the application.
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
new file mode 100644
index 00000000..69456860
--- /dev/null
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="es" />
+</locale-config>
diff --git a/docs/whatsNew/WHATS_NEW_EN.md b/docs/whatsNew/WHATS_NEW_EN.md
index 39b3ff55..fde67366 100644
--- a/docs/whatsNew/WHATS_NEW_EN.md
+++ b/docs/whatsNew/WHATS_NEW_EN.md
@@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.*
 ### Added
 - Address book encryption
 - The device authentication feature on the Zashi app launch has been added
-- Zashi app now supports Spanish language
+- Zashi app now supports Spanish language. It can be changed in the System settings options.
 - The Flexa SDK has been adopted to enable payments using the embedded Flexa UI
 - New Sending, Success, Failure, and GrpcFailure subscreens of the Send Confirmation screen have been added
 - New Copy Transaction IDs feature has been added to the MultipleTransactionFailure screen
diff --git a/docs/whatsNew/WHATS_NEW_ES.md b/docs/whatsNew/WHATS_NEW_ES.md
index 5474ed77..d222098c 100644
--- a/docs/whatsNew/WHATS_NEW_ES.md
+++ b/docs/whatsNew/WHATS_NEW_ES.md
@@ -12,7 +12,7 @@ directly impact users rather than highlighting other key architectural updates.*
 ### Added
 - Address book encryption
 - The device authentication feature on the Zashi app launch has been added
-- Zashi app now supports Spanish language
+- Zashi app now supports Spanish language. It can be changed in the System settings options.
 - The Flexa SDK has been adopted to enable payments using the embedded Flexa UI
 - New Sending, Success, Failure, and GrpcFailure subscreens of the Send Confirmation screen have been added
 - New Copy Transaction IDs feature has been added to the MultipleTransactionFailure screen