diff --git a/ChangeLog b/ChangeLog
index 337af44277..5c9bf7414f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-25  Mike FABIAN  <mfabian@redhat.com>
+
+	* localedata/locales/cmn_TW (LC_MESSAGES): In yesexpr and noexpr,
+	also check for Chinese characters.
+
 2017-10-25  Mike FABIAN  <mfabian@redhat.com>
 
 	* localedata/locales/chr_US (LC_MESSAGES): In yesexpr and noexpr,
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index 03364963db..30449b19c9 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -169,10 +169,8 @@ measurement 1
 END LC_MEASUREMENT
 
 LC_MESSAGES
-% ^[yY]
-yesexpr "<U005E><U005B><U0079><U0059><U005D>"
-% ^[nN]
-noexpr  "<U005E><U005B><U006E><U004E><U005D>"
+yesexpr "^[+1yY<U662F>]"
+noexpr  "^[-0nN<U4E0D><U5426>]"
 % 是
 yesstr  "<U662F>"
 % 不是