diff --git a/Makefile.am b/Makefile.am
index 87cbadff..4e0f6ee5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -412,6 +412,7 @@ phsource/phonemes.stamp: \
 	phsource/ph_punjabi \
 	phsource/ph_pyash \
 	phsource/ph_quechua \
+	phsource/ph_quenya \
 	phsource/ph_romanian \
 	phsource/ph_russian \
 	phsource/ph_russian_lv \
diff --git a/dictsource/qya_rules b/dictsource/qya_rules
index 4a9894f4..e02f15db 100644
--- a/dictsource/qya_rules
+++ b/dictsource/qya_rules
@@ -64,7 +64,7 @@
 
 .group i
 	i	i
-	// TODO iu (no suitable diphthong in ph_latin)
+	iu (+	iu
 	// light penultimate syllable: put stress on antepenultimate
 	i (AX	=i
 	i (CAX	=i
@@ -131,7 +131,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_quenya b/phsource/ph_quenya
new file mode 100644
index 00000000..5f958db8
--- /dev/null
+++ b/phsource/ph_quenya
@@ -0,0 +1,13 @@
+phoneme ui
+  vwl starttype #u endtype #i
+  length 270
+  lng
+  FMT(vdiph/ui_4)
+endphoneme
+
+phoneme iu
+  vwl starttype #i endtype #u
+  length 280
+  lng
+  FMT(vdiph2/iu_2)
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index d64bf982..582b1560 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1921,8 +1921,9 @@ phonemetable py eo
 include ph_pyash
 
 phonemetable qya la
+include ph_quenya
 
-phonemetable sjn qya
+phonemetable sjn la
 
 phonemetable es-la es
 include ph_spanish_la