diff --git a/ChangeLog b/ChangeLog
index 86289389c1..325a38d222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 21 09:26:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SETJMP): fix missing macro definition
+	  for the configured result.  fix up r55021.
+
 Sat May 21 00:36:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (rb_execarg_commandline): build command line string
diff --git a/configure.in b/configure.in
index 872532a240..52d97a6af8 100644
--- a/configure.in
+++ b/configure.in
@@ -2589,7 +2589,9 @@ AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1,
     m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);],
     ac_cv_func_$1=yes,
     ac_cv_func_$1=no)]
-)])
+)
+AS_IF([test "$ac_cv_func_]$1[" = yes], [AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)])
+])
 
 AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [
 if test x"${ac_cv_func___builtin_setjmp}" = xyes; then