diff --git a/ChangeLog b/ChangeLog
index 8e97b73f48..b524fd9949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  1 15:12:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
+	  work with multiple -arch options.
+
 Wed Apr  1 13:46:20 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* thread.c (rb_thread_fd_select): new function to call select
diff --git a/Makefile.in b/Makefile.in
index 766b1124d6..1de779a3b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,7 +216,7 @@ lex.c: defs/keywords
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
 
 .c.i:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+	$(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
 
 clean-local::
 	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output