diff --git a/ChangeLog b/ChangeLog
index 87717a5779..7617567dd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  8 17:53:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
+
 Tue Mar  8 17:33:38 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_write_console): now no need to check
diff --git a/insns.def b/insns.def
index f9514d4038..20140b30c1 100644
--- a/insns.def
+++ b/insns.def
@@ -1548,7 +1548,7 @@ opt_mod
 	    long div, mod;
 
 	    if (y == 0)
-		rb_num_zerodiv();
+		goto INSN_LABEL(normal_dispatch);
 	    if (y < 0) {
 		if (x < 0)
 		    div = -x / -y;