diff --git a/ChangeLog b/ChangeLog
index e0392d3bd6..a246ba8b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 28 11:32:37 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/GNUmakefile.in (.rbconfig.time): r36828 was incomplete.
+	  It did not run correctly on clean build.
+
 Tue Aug 28 09:25:20 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (Makefile): make to depend on common.mk, to
diff --git a/nacl/GNUmakefile.in b/nacl/GNUmakefile.in
index a31675d677..c1aaa36c7c 100644
--- a/nacl/GNUmakefile.in
+++ b/nacl/GNUmakefile.in
@@ -47,7 +47,8 @@ file.$(OBJEXT):
 	$(Q) $(OBJCOPY) --weaken-symbol=rb_file_load_ok $@.tmp $@
 	@-$(RM) $@.tmp
 
-$(RBCONFIG):
+.rbconfig.time:
+	@$(MAKE) .rbconfig.raw.time RBCONFIG=.rbconfig.raw.time
 	@sed \
 	  -e 's!CONFIG\["CC"\] = .*!CONFIG\["CC"\] = "$(CC)"!' \
 	  -e 's!CONFIG\["LD"\] = .*!CONFIG\["LD"\] = "$(LD)"!' \