diff --git a/ChangeLog b/ChangeLog
index b21f8353a8..f2c3cfb1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 15 19:37:33 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy
+	  implementation but has no declaration and does not work in
+	  NativeClient SDK pepper_20.
+
 Wed Aug 15 19:29:29 2012  Yuki Yugui Sonoda  <yugui@google.com>
 
 	* common.mk (vm_backtrace.o): Added missing dependencies.
diff --git a/configure.in b/configure.in
index 68d37fc8cd..e8b1cc739a 100644
--- a/configure.in
+++ b/configure.in
@@ -1244,6 +1244,7 @@ main()
   else
     RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
   fi
+  ac_cv_func_shutdown=no
   ],
 [	LIBS="-lm $LIBS"])
 AC_CHECK_LIB(crypt, crypt)