diff --git a/ChangeLog b/ChangeLog
index 2d4334b394..b14fc8db7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  5 13:41:13 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/etc/extconf.rb: use egrep_cpp.
+
 Mon Jun  4 04:14:53 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
 	* lib/shellwords.rb: don't destroy argument.
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 6fe8810464..b920d91a95 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,17 +1,8 @@
 require 'mkmf'
 
 def etc_grep_header(field)
-  f = open("conftest.c", "w")
-  f.print <<EOF
-#include <pwd.h>
-EOF
-  f.close
-  begin
-    if xsystem("#{CPP} | egrep #{field}")
-      $defs.push(format("-D%s", field.upcase))
-    end
-  ensure
-    system "rm -f conftest.c"
+  if egrep_cpp(field, "#include <pwd.h>\n")
+    $defs.push(format("-D%s", field.upcase))
   end
 end