diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
index fd2bf918c1..0033fad8d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbip/AmazfitBipService.java
@@ -32,6 +32,7 @@ public class AmazfitBipService {
     public static final byte[] COMMAND_SET_LANGUAGE_SIMPLIFIED_CHINESE = new byte[]{ENDPOINT_DISPLAY, 0x13, 0x00, 0x00};
     public static final byte[] COMMAND_SET_LANGUAGE_TRADITIONAL_CHINESE = new byte[]{ENDPOINT_DISPLAY, 0x13, 0x00, 0x01};
     public static final byte[] COMMAND_SET_LANGUAGE_ENGLISH = new byte[]{ENDPOINT_DISPLAY, 0x13, 0x00, 0x02};
+    public static final byte[] COMMAND_SET_LANGUAGE_SPANISH = new byte[]{ENDPOINT_DISPLAY, 0x13, 0x00, 0x03};
 
     public static final byte[] COMMAND_ACK_FIND_PHONE_IN_PROGRESS = new byte[]{ENDPOINT_DISPLAY, 0x14, 0x00, 0x00};
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
index c10728ae6e..2181b12c6b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/amazfitbip/AmazfitBipSupport.java
@@ -319,6 +319,14 @@ public class AmazfitBipSupport extends MiBand2Support {
             case 2:
                 command = AmazfitBipService.COMMAND_SET_LANGUAGE_ENGLISH;
                 break;
+            case 3:
+                Version version = new Version(gbDevice.getFirmwareVersion());
+                if (version.compareTo(new Version("0.1.0.66")) >= 0) {
+                    command = AmazfitBipService.COMMAND_SET_LANGUAGE_SPANISH;
+                } else {
+                    command = AmazfitBipService.COMMAND_SET_LANGUAGE_ENGLISH;
+                }
+                break;
             default:
                 if (language.equals("zh")) {
                     if (country.equals("TW") || country.equals("HK") || country.equals("MO")) { // Taiwan, Hong Kong,  Macao
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f2830dd9d4..dc290da034 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -207,6 +207,7 @@
         <item name="0">@string/simplified_chinese</item>
         <item name="1">@string/traditional_chinese</item>
         <item name="2">@string/english</item>
+        <item name="3">@string/spanish</item>
     </string-array>
 
     <string-array name="pref_amazfitbip_language_values">
@@ -214,6 +215,7 @@
         <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
 
     <string-array name="prefs_heartrate_measurement_interval">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9bb00e30e..018dec8a6d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -406,6 +406,7 @@
     <string name="simplified_chinese">Simplified Chinese</string>
     <string name="traditional_chinese">Traditional Chinese</string>
     <string name="english">English</string>
+    <string name="spanish">Spanish</string>
 
     <string name="FetchActivityOperation_about_to_transfer_since">About to transfer data since %1$s</string>