diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60b0f75c..b186fc2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ updated languages:
 *  shn (Shan Tay Yai) -- ronaldaug
 *  tr (Turkish) -- boracasli98
 *  ur (Urdu) -- Ejaz Shah
-*  zh (Chinese) -- Silas S. Brown
+*  zh (Chinese) -- Silas S. Brown, Rongcui Dong
 
 new languages:
 *  haw (Hawaiian) -- Valdis Vitolins
diff --git a/Makefile.am b/Makefile.am
index b28daa81..22b2faff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -863,7 +863,7 @@ zh: espeak-ng-data/zh_dict
 dictsource/zh_listx:
 	ln -svf extra/zh_listx dictsource/
 if HAVE_ZH_EXTENDED_DICTIONARY
-espeak-ng-data/zh_dict: dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_listx dictsource/zh_emoji
+espeak-ng-data/zh_dict: dictsource/zh_list dictsource/zh_rules dictsource/zh_listx dictsource/zh_extra dictsource/zh_emoji
 else
 espeak-ng-data/zh_dict: dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_emoji
 endif
diff --git a/dictsource/zh_list b/dictsource/zh_list
index ba1c807d..ee5fbb3b 100644
--- a/dictsource/zh_list
+++ b/dictsource/zh_list
@@ -586,7 +586,7 @@ $textmode
 補	bu3
 痺	bi4
 制	zhi4
-友	you5
+友	you3
 毛	mao2
 壽	shou4
 薄	bao2
@@ -1189,7 +1189,7 @@ $textmode
 誒	ei2
 称	cheng1
 轿	jiao4
-甚	shen2
+甚	shen4
 洪	hong2
 握	wo4
 搏	bo2
@@ -3680,7 +3680,7 @@ $textmode
 贵	gui4
 故	gu4
 絕	jue2
-啥	sha4
+啥	sha2
 压	ya1
 條	tiao2
 薯	shu3
diff --git a/phsource/ph_zh b/phsource/ph_zh
index deeba521..49c6d622 100644
--- a/phsource/ph_zh
+++ b/phsource/ph_zh
@@ -437,7 +437,7 @@ endphoneme
 
 phoneme uai
   vwl starttype #u endtype #i
-  length 250
+  length 511
   FMT(vwl_zh/uai)
 endphoneme
 
diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test
index b425886d..1cf3c3d6 100755
--- a/tests/language-phonemes.test
+++ b/tests/language-phonemes.test
@@ -44,7 +44,7 @@ test_lang bn 7fc6c8c6b347677885c6e973ff4dc6b2b6fa6d59 "ma na Na pa ta t.a tSa ka
 test_lang bpy 7fc6c8c6b347677885c6e973ff4dc6b2b6fa6d59 "ma na Na pa ta t.a tSa ka p#a t#a t.#a tS#a k#a ba da d.a dZa ga b#a d#a d.#a g#a fa Ba sa za Sa Za ha Ha wa la ja ra *a Ra _:_ ma mE mO me mi mi mu m& mV"
 test_lang bs f3b9ea69a52d9cabc18007c0bb49c16583acef1b "ma na Na pa ta ka ba da ga tsa tSa tS;a dZa dZ;a fa sa Sa xa va za Za ja la l^a Ra r*a _:_ m@ m@2 ma ma: me me: mo mo: mi mi: mu mu: mA m& mE mU maI"
 test_lang ca 563b93f7de72fb4832f2908484bad4908680d7da "ma na n^a Na pa ta ka ba da ga tsa tSa dza dZa sa Sa za Za fa Ta xa va Q\"a ja wa la l^a Ra *a _:_ ma ma# me mE mE2 mO mo mi mU mu"
-test_lang cmn e7831fc783f79f1505e90d81d193dc591cb6f54e "na Na la ja pa pha fa ta tha ka kha tS;a tS;ha S;a s.a tsa tsha ts.a ts.ha N-a _:_ ma mA mai mAu m@ m@r mE mei mi mi[ mi. miA miAu miE mio miou mo mo- mou mong mu muA mua muai mu@ mei muo my myu my& myE my@ myi _:_ ma11 ma21 ma214 ma22 ma33 ma35 ma44 ma51 ma53 ma55"
+test_lang cmn 368d0fd8e646e37e402377328df39b1d6e832401 "na Na la ja pa pha fa ta tha ka kha tS;a tS;ha S;a s.a tsa tsha ts.a ts.ha N-a _:_ ma mA mai mAu m@ m@r mE mei mi mi[ mi. miA miAu miE mio miou mo mo- mou mong mu muA mua muai mu@ mei muo my myu my& myE my@ myi _:_ ma11 ma21 ma214 ma22 ma33 ma35 ma44 ma51 ma53 ma55"
 test_lang cs 73d5bdeebdab81c629d34f76c87930bb6a188c50 "ma na n^a pa ta ca ka ba da Ja ga tsa tSa dza dZa fa sa Sa xa va za Za ha r-a Ra R^a R^/a la ja _:_ mi mi: me me: ma ma: mo mo: mu mu: maU meU moU"
 test_lang cy 5c5c7ab1c1b531dcacbbe072d5ee9cef3467d945 "ma na Na pa ta ka ba da ga tSa dZa fa Ta sa Sa xa ha ca Da za ra Ca la l/2a ja wa _:_ ma mE mI mY mO mU mV mi: my: mu: me: mo: mA: mAY maI maY maU m@I m@Y meU mIu mYu mOI mOY muI muY"
 test_lang da c55842af4f63fd67e6e48b97903b77223b6a4d77 "ma na Na pa ta ka ba da ga fa sa ha S;a tS;a va Da ja ra Ra _:_ m@ m@- m3 m3- mi m?i mI me m?e mE m?E m& m?& m&# m?&# mA m?A mu m?u mo m?o mO m?O mV m?V m0 m?0 my m?y mY mW m?W mW# m?W# maI"