diff --git a/strans.c b/strans.c
index 70fe038..5d240b3 100644
--- a/strans.c
+++ b/strans.c
@@ -266,7 +266,8 @@ okuriletter(Rune r)
 {
 	static char *rows[] = {
 		"aあ", "iい", "uう", "eえ", "oお",
-		"kかきくけこ", "gがぎぐげご", "sさしすせそ", "zざじずぜぞ",
+		"kかきくけこ", "gがぎぐげご", "sさしすせそ", "zざずぜぞ",
+		"jじ",
 		"tたちつてとっ", "dだぢづでど", "nなにぬねのん", "hはひふへほ",
 		"bばびぶべぼ", "pぱぴぷぺぽ", "mまみむめも", "yやゆよ",
 		"rらりるれろ", "wわ",
diff --git a/tests/engine_test.c b/tests/engine_test.c
index 8df793b..91abe25 100644
--- a/tests/engine_test.c
+++ b/tests/engine_test.c
@@ -1282,6 +1282,19 @@ engine_japanese_candidates(struct ct *t)
 		checkstr(t, "sokuon written in kana", "行った", &im.kouho[1]);
 	}
 	CT_CHECK(t, keystroke(Kesc, 0, &com));
+	/* じ is keyed j, as SKK types it; ざずぜぞ keep z. */
+	setdict(jp->dict, "しんj", "信");
+	setdict(jp->dict, "まz", "混");
+	if(!typekeys(t, "shinjiru", &com))
+		goto cleanup;
+	if(CT_EQ_INT(t, 1, im.nkouho))
+		checkstr(t, "じ okurigana", "信じる", &im.kouho[0]);
+	CT_CHECK(t, keystroke(Kesc, 0, &com));
+	if(!typekeys(t, "mazeru", &com))
+		goto cleanup;
+	if(CT_EQ_INT(t, 1, im.nkouho))
+		checkstr(t, "ぜ okurigana", "混ぜる", &im.kouho[0]);
+	CT_CHECK(t, keystroke(Kesc, 0, &com));
 	/* A romaji typo stays in the reading for Backspace to mend. */
 	if(!typekeys(t, "kanjr", &com))
 		goto cleanup;