diff --git a/encoder.c b/encoder.c
index 441b480..01f2926 100644
--- a/encoder.c
+++ b/encoder.c
@@ -14,15 +14,20 @@ struct encoder_tuple {
 
 static const struct encoder_tuple table[] = {
 	{"a-", "ā"},	{"A-", "Ā"},
+	{"á", "ā"},	{"Á", "Ā"},
 	{"i-", "ī"},	{"I-", "Ī"},
+	{"í", "ī"},	{"Í", "Ī"},
 	{"u-", "ū"},	{"U-", "Ū"},
+	{"ú", "ū"},	{"Ú", "Ū"},
 	{"r.", "ṛ"},	{"R.", "Ṛ"},
 	{"r.-", "ṝ"},	{"R.-", "Ṝ"},
 	{"l.", "ḷ"},	{"L.", "Ḷ"},
 	{"l.-", "ḹ"},	{"L.-", "Ḹ"},
 	{"n^.", "ṅ"},	{"N^.", "Ṅ"},
 	{"n~", "ñ"},	{"N~", "Ñ"},
+	{"ň", "ñ"},	{"Ň", "Ñ"},
 	{"s,", "ś"},	{"S,", "Ś"},
+	{"š", "ś"},	{"Š", "Ś"},
 	{"t.", "ṭ"},	{"T.", "Ṭ"},
 	{"d.", "ḍ"},	{"D.", "Ḍ"},
 	{"n.", "ṇ"},	{"N.", "Ṇ"},