diff --git a/ChangeLog b/ChangeLog
index 95873ed75..63f0bfdfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-20  Dominik Röttsches  <drott@google.com>
+
+	Fix some `ttnameid.h' entries (#50313).
+
+	* include/freetype/ttnameid.h:
+	s/TT_MS_LANGID_SPANISH_INTERNATIONAL_SORT/TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT/,
+	s/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIA/TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN/.
+
 2017-02-20  Werner Lemberg  <wl@gnu.org>
 
 	[cff] Finish support for `random' operator.
diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h
index ea7f1340e..04be3f77c 100644
--- a/include/freetype/ttnameid.h
+++ b/include/freetype/ttnameid.h
@@ -669,7 +669,7 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
 #define TT_MS_LANGID_ENGLISH_INDONESIA                 0x3809
 #define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3C09
-#define TT_MS_LANGID_SPANISH_INTERNATIONAL_SORT \
+#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT \
           TT_MS_LANGID_SPANISH_SPAIN_MODERN_SORT
 #define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40AU
 #define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1C0C
@@ -728,7 +728,7 @@ FT_BEGIN_HEADER
 #define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN           0x0846
 #define TT_MS_LANGID_ORIYA_INDIA \
           TT_MS_LANGID_ODIA_INDIA
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIA \
+#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN \
           TT_MS_LANGID_MONGOLIAN_PRC
 #define TT_MS_LANGID_TIBETAN_CHINA \
           TT_MS_LANGID_TIBETAN_PRC