diff --git a/ChangeLog b/ChangeLog
index b5ea9fcfe5..3f1c8ebf7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Thu Jun 14 22:49:44 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jun 14 22:59:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CPPOUTFILE): check if output is really sent to
+	  specified file to tell if -o option works.  [ruby-dev:45742]
+	  [Bug#6591]
 
 	* configure.in (RUBY_CPPOUTFILE): check if output file is actually
 	  created.  [ruby-dev:45742] [Bug#6591]
diff --git a/configure.in b/configure.in
index 964b96d5d7..347a628169 100644
--- a/configure.in
+++ b/configure.in
@@ -139,7 +139,8 @@ AC_DEFUN([RUBY_CPPOUTFILE],
 [cppflags=$CPPFLAGS
 CPPFLAGS='-o conftest-1.i'
 rb_cv_cppoutfile=no
-AC_TRY_CPP([], [test -f conftest-1.i && rb_cv_cppoutfile=yes])
+AC_TRY_CPP([test-for-cppout],
+	   [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes])
 CPPFLAGS=$cppflags
 rm -f conftest*])
 if test "$rb_cv_cppoutfile" = yes; then