diff --git a/ChangeLog b/ChangeLog
index e79fe6000f..5ccef6a05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 28 14:26:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Removed code now covered by data from table.
+
 Mon Mar 28 11:49:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* enc/unicode.c: Adding comments. [ci skip]
diff --git a/enc/unicode.c b/enc/unicode.c
index a7483468f9..0e5d29b913 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -704,12 +704,6 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
 		    }
 		}
 	    }
-	    /* the following special case for  DOTLESS i -> I
-	     * can be removed once we rely on data,
-	     * because the mapping is always the same */
-	    else if (code==DOTLESS_i && (flags&ONIGENC_CASE_UPCASE)) {
-		code = 'I'; MODIFIED;
-	    }
 	    else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */
 		if (flags&OnigCaseFoldFlags(folded->n)) {
 		    const OnigCodePoint *next;