diff --git a/ChangeLog b/ChangeLog
index d7d22e9836..1cff55f8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan  7 22:13:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (man, gem): fixed errors.
+
 Wed Jan  7 17:14:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb: use installed libraries.  [ruby-core:21006]
diff --git a/instruby.rb b/instruby.rb
index ff7de147cf..4edfe6e032 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -397,7 +397,9 @@ install?(:local, :comm, :man) do
     else
       require File.join(srcdir, "tool/mdoc2man.rb")
 
-      Tempfile.open(mdoc) do |w|
+      w = nil
+      Tempfile.open(mdoc) do |f|
+        w = f
         open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)}
       end
       install w.path, destfile, :mode => $data_mode
@@ -409,8 +411,9 @@ end
 install?(:local, :comm, :gem) do
   puts "creating default gem directories"
 
+  directories = %w[cache doc gems specifications]
   gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
-  makedirs Gem::DIRECTORIES.collect {|dir| File.join(gpath, dir)}
+  makedirs directories.collect {|dir| File.join(gpath, dir)}
 end
 
 $install << :local << :ext if $install.empty?