diff --git a/ChangeLog b/ChangeLog
index a433bb4b36..cd9b307f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 29 14:50:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* Makefile.in (ext-clean): ext-clean always fails.
+
+	* ext/dl/ripper/extconf.rb: adds y.output into the clean list.
+
 Mon Dec 29 11:58:39 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* thread.c (rb_mutex_trylock): return false if Mutex owned
diff --git a/Makefile.in b/Makefile.in
index e3a8fc6955..926b82b424 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -228,7 +228,11 @@ clean-ext distclean-ext realclean-ext::
 	    dir=`dirname "$$mk"`; \
 	    echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \
 	    (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \
+	    if [ $@ == clean-ext ]; then \
+	    	true; \
+	    else \
+		rmdir -p "$$dir" 2> /dev/null; \
+	    fi; \
 	done
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index a41a6af2d8..4914d70e78 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -11,7 +11,7 @@ def main
     end
   end
   $objs = %w(ripper.o)
-  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
+  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c)
   $defs << '-DRIPPER'
   $defs << '-DRIPPER_DEBUG' if $debug
   $VPATH << '$(topdir)' << '$(top_srcdir)'