diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fdeec5c..1f9f21e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ updated languages:
 *  ia (Interlingua) -- nesrad
 *  it (Italian) -- Christian Leo
 *  ja (Japanese) -- fukuen
+*  mi (Māori) -- boracasli98
 *  shn (Shan Tay Yai) -- ronaldaug
 *  tr (Turkish) -- boracasli98
 *  ur (Urdu) -- Ejaz Shah
diff --git a/dictsource/mi_list b/dictsource/mi_list
index 3ec70cd6..b22312fe 100644
--- a/dictsource/mi_list
+++ b/dictsource/mi_list
@@ -1,13 +1,13 @@
 // Numbers
-_0	kore
+_0	kORe
 _1	tahi
-_2	rua
-_3	toru
+_2	Rua
+_3	tORu
 _4	fa:
-_5	rima
+_5	Rima
 _6	ono
-_7	whitu
-_8	waru
+_7	fitu
+_8	waRu
 _9	iwa
 
 // Words
diff --git a/dictsource/mi_rules b/dictsource/mi_rules
index 59b5d216..fd37146d 100644
--- a/dictsource/mi_rules
+++ b/dictsource/mi_rules
@@ -5,6 +5,10 @@
 
 .group a
              a            a
+             ae	aI
+             ai	aI
+             ao	aU
+             au	au"
 
 .group ā
              ā            a:
@@ -22,16 +26,19 @@
              ī            i:
 
 .group o
-             o            o
+             o            O
+             oe	we
+             oi	oI
+             ou	ou"
 
 .group ō
-             ō            o:
+             ō            O:
 
 .group u
-             u            u
+             u            u"
 
 .group ū
-             ū            u:
+             ū            u":
 
 // consonants
 
@@ -52,7 +59,7 @@
              p            p
 
 .group r
-             r            r
+             r            R
 
 .group t
              t            t
diff --git a/phsource/ph_maori b/phsource/ph_maori
index 022f796e..358bf3e7 100644
--- a/phsource/ph_maori
+++ b/phsource/ph_maori
@@ -52,16 +52,16 @@ phoneme o:
   FMT(vowel/o)
 endphoneme
 
-phoneme u
+phoneme u"
   vwl starttype #u endtype #u
   length 140
-  FMT(vowel/u) // working hypothesis
+  FMT(vwl_ru/u#u)
 endphoneme
 
-phoneme u:
+phoneme u":
   vwl starttype #u endtype #u
   length 280
-  FMT(vowel/u)
+  FMT(vwl_ru/u#u)
 endphoneme
 
 //===========
diff --git a/phsource/phonemes b/phsource/phonemes
index 23e2dcc3..2c5a4773 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1763,9 +1763,6 @@ include ph_lithuanian
 phonemetable lv base1
 include ph_latvian
 
-phonemetable mi base1
-include ph_maori
-
 phonemetable my base1
 include ph_myanmar
 
@@ -1848,6 +1845,9 @@ include ph_italian
 phonemetable ku base2
 include ph_kurdish
 
+phonemetable mi base2
+include ph_maori
+
 phonemetable nci base2
 include ph_nahuatl
 
diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test
index df013cc7..1468c89e 100755
--- a/tests/language-phonemes.test
+++ b/tests/language-phonemes.test
@@ -96,6 +96,6 @@ test_lang la 080bd53c20991eae7baec73b8c735eacc8aae076 "ma na Na pa p<h>a ba ta t
 test_lang lfn 044e27a5100528760a185e0773dccaca504b5bd4 "ma na Na pa ba ta da ka ga fa va sa za Sa Za ha la ja R2a **a wa _:_ ma me mi mo mu maI maU meU moI"
 test_lang lt 615e503b996ea5f7b267ebd77b91e77c5b874e18 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
 test_lang lv d1a84f9881e4819b46f907723184587e28e885d9 "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
-test_lang mi b6e622de46c33181cdfea351b907f932da9a0a1a "ma na Na pa ta ka fa ha ra wa _:_ ma ma: me me: mi mi: mo mo: mu mu:"
+test_lang mi 2f2a08d9cf9ba62cbe3569bdb45137fa9d21c0e6 "ma na Na pa ta ka fa ha ra wa _:_ ma ma: me me: mi mi: mo mo: mu mu:"
 test_lang mk 072d0a74acf54bea528e7dde427eb04808d38364 "ma na n^a Na pa ta xa k^a ka ba da Ja ga tsa tSa tS;a dza dZa dZ;a fa sa Sa xa va za Za l^a la ja Ra @-*a ra _:_ ma me mi mo mu mA mE ma: me: mi: mo: mu: moU"
 test_lang shn e568aca66c2f58fdaf5dda8a67f4d21f05710234 "ma na Ja Na pa p_ha ba ta t_ha da ka k_ha ga ?a fa sa za Ta ha tS;a Ra ja wa la _:_ mi mI mW mu me m@ mo mE ma ma: mO miu meu mEu mau ma:u mWi mui m@i moi mai ma:i mOi maW _:_ ma1 ma2 ma3 ma4 ma5 ma6"
diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test
index 26c089bb..c342b68f 100755
--- a/tests/language-pronunciation.test
+++ b/tests/language-pronunciation.test
@@ -151,11 +151,11 @@ test_phonemes lfn "Latn" "t'ota um'anes n'ase l'ib**e e eg'al en d'inja e di**'e
 los es don'ada **az'ona e k,onsi;'ensa e d'ebe 'ata la 'un a la 'ot**a en 'un spi**'ito de f**'ati;,a" "Tota umanes nase libre e egal en dinia e diretos. Los es donada razona e consiensa e debe ata la un a la otra en un spirito de fratia."
 test_phonemes lt "Latn" "i:l;ingd'ama fext'Uoto:jo: Sp'aga subl;i:ktS;;o:j'us;i p@-rag@-r;'eAZee apv'alu: arb'u:za:" "Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą."
 test_phonemes lv "Latn" "gl'a:ZScu:n^a R'u:ci:Si Dz\`_|'E:Ruma: tS'iepj b'aha k'ontsERtfli:Jel^u v'a::kus" "Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus."
-test_phonemes mi "Latn" "k'o_| t'e_| kat'oa_ 'o_| N'a_| taN'ata_ 'i_| t'e_| f,ana,uNat'aNa_| m'ai_ 'e_| wat'ea_ 'ana_ 'i_| N'a_| h'ere_| kat'oa_|
-'e_| t,aur,iter'ite_ 'ana_| h'oki_| N'a_| m'ana_| m'e_| N'a_| t'ika_|
-'e_| f,akafif'ia_ 'ana_| h'oki_| k'i_ 'a_| rat'ou_| t'e_| Nak'au_| f'ai_| f,aka'aro_| m'e_| t'e_| h,ineN'aro_| moh'io_| k'i_| t'e_| t'ika_| m'e_| t'e_| h'e_|
-'a_ 'e_| t'ika_ 'ana_| k'ia_| me'iNa_| t'e_| m'ahi_ 'a_| tet'ahi_| k'i_| tet'ahi_| m'e_| m'a_| r'oto_ 'atu_ 'i_| t'e_| w,air'ua_ 'o_| t'e_| n'oho_| t'ahi_|
-'ano_| h'e_| te'ina_| h'e_| t,uak'ana_ 'i_| r'iNa_ 'i_| t'e_| f,aka'aro_| kot'ahi_|" "Ko te katoa o nga tangata i te whanaungatanga mai e watea ana i nga here katoa; e tauriterite ana hoki nga mana me nga tika. E whakawhiwhia ana hoki ki a ratou te ngakau whai whakaaro me te hinengaro mohio ki te tika me te he, a e tika ana kia meinga te mahi a tetahi ki tetahi me ma roto atu i te wairua o te noho tahi, ano he teina he tuakana i ringa i te whakaaro kotahi."
+test_phonemes mi "Latn" "k'O_| t'e_| kat'Oa_ 'O_| N'a_| taN'ata_ 'i_| t'e_| f,ana,u\"Nat'aNa_| m'aI_ 'e_| wat'ea_ 'ana_ 'i_| N'a_| h'eRe_| kat'Oa_|
+'e_| t,au\"R,iteR'ite_ 'ana_| h'Oki_| N'a_| m'ana_| m'e_| N'a_| t'ika_|
+'e_| f,akafif'ia_ 'ana_| h'Oki_| k'i_ 'a_| Rat'ou\"_| t'e_| Nak'au\"_| f'aI_| f,aka'aRO_| m'e_| t'e_| h,ineN'aRO_| mOh'iO_| k'i_| t'e_| t'ika_| m'e_| t'e_| h'e_|
+'a_ 'e_| t'ika_ 'ana_| k'ia_| me'iNa_| t'e_| m'ahi_ 'a_| tet'ahi_| k'i_| tet'ahi_| m'e_| m'a_| R'OtO_ 'atu\"_ 'i_| t'e_| waIR'u\"a_ 'O_| t'e_| n'OhO_| t'ahi_|
+'anO_| h'e_| te'ina_| h'e_| t,u\"ak'ana_ 'i_| R'iNa_ 'i_| t'e_| f,aka'aRO_| kOt'ahi_|" "Ko te katoa o nga tangata i te whanaungatanga mai e watea ana i nga here katoa; e tauriterite ana hoki nga mana me nga tika. E whakawhiwhia ana hoki ki a ratou te ngakau whai whakaaro me te hinengaro mohio ki te tika me te he, a e tika ana kia meinga te mahi a tetahi ki tetahi me ma roto atu i te wairua o te noho tahi, ano he teina he tuakana i ringa i te whakaaro kotahi."
 test_phonemes mk "Cyrl" "dz'id&Rsk,I p'ejz&Z
 S'ug&f b'ilmez_! s_ tS;'uden^,e dZv'ak& k^'ofte_:_: i_: k'el^ n'a t'udZ; ts'eh" "Ѕидарски пејзаж: шугав билмез со чудење џвака ќофте и кељ на туѓ цех."
 test_phonemes mk "Latn" "dz'id&Rsk,I p'ejz&Z