diff --git a/Makefile.am b/Makefile.am
index 4e0f6ee5..7bada1b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,6 +420,7 @@ phsource/phonemes.stamp: \
 	phsource/ph_serbian \
 	phsource/ph_setswana \
 	phsource/ph_shan \
+	phsource/ph_sindarin \
 	phsource/ph_sindhi \
 	phsource/ph_sinhala \
 	phsource/ph_slovak \
diff --git a/dictsource/sjn_rules b/dictsource/sjn_rules
index 234d0297..933ee71e 100644
--- a/dictsource/sjn_rules
+++ b/dictsource/sjn_rules
@@ -10,7 +10,7 @@
 
 .group a
 	a	a
-	ae (+	aI // TODO ae and ai should be different
+	ae (+	aE
 	ai (+	aI
 	au (+	aU
 	// light penultimate syllable: put stress on antepenultimate
@@ -97,7 +97,7 @@
 
 .group o
 	o	o
-	oe (+	OI // TODO oe and oi should be different
+	oe (+	OI
 	// light penultimate syllable: put stress on antepenultimate
 	o (AX	=o
 	o (CAX	=o
@@ -136,7 +136,7 @@
 
 .group u
 	u	u
-	// TODO ui (no suitable diphthong in ph_latin)
+	ui (+	ui
 	// light penultimate syllable: put stress on antepenultimate
 	u (AX	=u
 	u (CAX	=u
diff --git a/phsource/ph_sindarin b/phsource/ph_sindarin
new file mode 100644
index 00000000..0240378e
--- /dev/null
+++ b/phsource/ph_sindarin
@@ -0,0 +1,18 @@
+phoneme aE
+  vwl starttype #a endtype #e
+  length 270
+  FMT(vdiph/ae)
+endphoneme
+
+phoneme aI
+  vwl starttype #a endtype #i
+  length 240
+  FMT(vdiph/ai)
+endphoneme
+
+phoneme ui
+  vwl starttype #u endtype #i
+  length 270
+  lng
+  FMT(vdiph/ui_4)
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index 582b1560..26e0dd18 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1924,6 +1924,7 @@ phonemetable qya la
 include ph_quenya
 
 phonemetable sjn la
+include ph_sindarin
 
 phonemetable es-la es
 include ph_spanish_la
diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test
index c7e09f5c..4e517207 100755
--- a/tests/language-pronunciation.test
+++ b/tests/language-pronunciation.test
@@ -194,7 +194,7 @@ test_phon sd "s'Indhi b'o:li; 'Ind.o: jo:R'Vpi xa:nd'a:n s'a~: t[a:l'Vq R,@k#@nd
 J'Vnhn t['e: ,aRb'i: bo:l'i:;a J'o: b'I t[@m'a:m v'Vd.o: as'VR ,a:he:
 h'Ina v'aqt s'Indhi b'o:li s'Indh J'e: m'Vk# b'o:li_! 'ae~ d,@f@t['VRi z@b'a:n ,a:he:" "سنڌي ٻولي انڊو يورپي خاندان سان تعلق رکندڙ آريائي ٻولي آھي، جنھن تي عربي ٻوليءَ جو بہ تمام وڏو اثر آهي. هن وقت سنڌي ٻولي سنڌ جي مک ٻولي ۽ دفتري زبان آھي." "Arab"
 test_phon si "t'aw@t st#'a:n@ k'i:p@j,@kin w'a:rta: w'u: s'ul.u p'ipiri:m s'ah@ d'e:s@p,a:l@n@ p'akS@ k r'ija:k,a:ri:n 'at@r@ '&tiwu: g'&t.um h'e:tuwen 'ek 'ajeku m'ij@gos k'i:p@ d'eneku t'uwa:l@ l'aba: t'ibe:" "තවත් ස්ථාන කීපයකින් වාර්තා වූ සුළු පිපිරීම් සහ දේශපාලන පක්ෂ ක්‍රියාකාරීන් අතර ඇතිවූ ගැටුම් හේතුවෙන් එක් අයෙකු මියගොස් කීප දෙනෙකු තුවාල ලබා තිබේ." "Sinh"
-test_phon sjn "'alf 'aman 'amaRT 'amon 'aRag,oRn aRn'OIdi;,ad bel'eRi;,and b'oRom,iR bRag'ollax bR'eTil bRiT'ombaR k'aIR kaR'aDRas k,elebR'i:an kRiss'aIgRim d'eneT,oR dR'eNgist d'u::n ekT'eli;,on 'emyn eR'i;ad,oR f'ean,oR f'iNgon fiNg'olfin fin'aRfin f'oRox,el g'alaD,on gal'adRi;,el gR'ond gw'aIhiR j'aRwaIn j'oReT iT'ili;,en loTl'o:Ri;,en miT'eITel miTR'andiR moR'annon m'oRi;,a oR'offin osg'ili;,aT pal'anti:R p,alant'i:Ri pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Arnoediad Beleriand Boromir Bragollach Brethil Brithombar Cair Caradhras Celebrían Crissaegrim Denethor Drengist dûn Ecthelion Emyn Eriador Fëanor Fingon Fingolfin Finarfin Forochel Galadhon Galadriel Grond Gwaihir Iarwain Ioreth Ithilien Lothlórien Mitheithel Mithrandir Morannon Moria Orophin Osgiliath Palantír Palantíri Pelennor Periannath Silivren Thorondor" "Sindarin"
+test_phon sjn "'alf 'aman 'amaRT 'amon 'aRag,oRn aRn'OIdi;,ad bel'eRi;,and b'oRom,iR bRag'ollax bR'eTil bRiT'ombaR bR'uinen k'aIR kaR'aDRas k,elebR'i:an kRiss'aEgRim d'eneT,oR dR'eNgist d'u::n ekT'eli;,on 'emyn eR'i;ad,oR f'ean,oR find'uilas f'iNgon fiNg'olfin fin'aRfin f'oRox,el g'alaD,on gal'adRi;,el gR'ond gw'aIhiR j'aRwaIn j'oReT iT'ili;,en loTl'o:Ri;,en miT'eITel miTR'andiR moR'annon m'oRi;,a oR'offin osg'ili;,aT pal'anti:R p,alant'i:Ri pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Arnoediad Beleriand Boromir Bragollach Brethil Brithombar Bruinen Cair Caradhras Celebrían Crissaegrim Denethor Drengist dûn Ecthelion Emyn Eriador Fëanor Finduilas Fingon Fingolfin Finarfin Forochel Galadhon Galadriel Grond Gwaihir Iarwain Ioreth Ithilien Lothlórien Mitheithel Mithrandir Morannon Moria Orophin Osgiliath Palantír Palantíri Pelennor Periannath Silivren Thorondor" "Sindarin"
 test_phon sk "k'r:d;el^ St;'astni:Q d;'atl^ow 'utSi: pR'i;u:st;i: v'a:hu m'l:kveho k'on^a 'ophRi:zat; k'uoRu_:_: a ZR'at; tS'eRstve: m'eso
 p'et;ti:Zdn^,ove: v'l:tSata: n'eRvo:zn^e St;'ekaju: n'amu,ojho d;'atl^a_! v_ t'r:n^i:" "Kŕdeľ šťastných ďatľov učí pri ústí Váhu mĺkveho koňa obhrýzať kôru a žrať čerstvé mäso. Päťtýždňové vĺčatá nervózne štekajú na môjho ďatľa v tŕní." "Latn"
 test_phon sl "xiSn'i:tSin bR'a:tEts uzg'a:ja p'o:wZE p'o:t fik'u:sOm" "Hišničin bratec vzgaja polže pod fikusom." "Latn"