diff --git a/ChangeLog b/ChangeLog
index 2cfdb2c2f5..fe09b1e0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 27 22:16:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* compile.c (new_label_body): missed backporting r54548 in r54698.
+	  this fixes randomly test failure introduced by r54698.
+	  cf. [Bug #12082]
+
 Tue Apr 26 13:38:31 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* README.EXT{,.ja}: `nul` should be uppercase.
diff --git a/compile.c b/compile.c
index 001152af70..cc8e748c83 100644
--- a/compile.c
+++ b/compile.c
@@ -929,6 +929,8 @@ new_label_body(rb_iseq_t *iseq, long line)
     labelobj->label_no = iseq->compile_data->label_no++;
     labelobj->sc_state = 0;
     labelobj->sp = -1;
+    labelobj->set = 0;
+    labelobj->rescued = LABEL_RESCUE_NONE;
     return labelobj;
 }
 
diff --git a/version.h b/version.h
index e0ced31b10..335a41e2d6 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.6"
-#define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 320
+#define RUBY_RELEASE_DATE "2016-04-27"
+#define RUBY_PATCHLEVEL 321
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"