diff --git a/ChangeLog b/ChangeLog
index 20c2b7605c..d192a73a7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (cd): no longer accept :noop option, related
+	  code is useless (backported from trunk, rev 1.67).
+	  [ruby-core:05858] [ruby-Bugs:2494]
+
 Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 320c49ce93..af36bbc738 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -118,7 +118,7 @@ module FileUtils
   def cd(dir, options = {}, &block) # :yield: dir
     fu_check_options options, :verbose
     fu_output_message "cd #{dir}" if options[:verbose]
-    Dir.chdir(dir, &block) unless options[:noop]
+    Dir.chdir(dir, &block)
     fu_output_message 'cd -' if options[:verbose] and block
   end
   module_function :cd