diff --git a/ChangeLog b/ChangeLog
index 0da431bb0e..424a6a126f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 12 01:05:04 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
+	  On making miniprelude.c, it seems use MINIRUBY. this fixes #7541
+	  but rubygems also needs to be fixed for older rubies.
+
 Wed Dec 12 00:32:11 2012  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* test/dl/test_func.rb (test_name_with_block, test_bind, test_qsort1):
diff --git a/tool/make-snapshot b/tool/make-snapshot
index cc4bc711f9..971dfd861e 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -69,9 +69,11 @@ path = ENV["PATH"].split(File::PATH_SEPARATOR)
   end
 end
 
-`#{ENV["BASERUBY"]} --disable-gem -e1 2>&1`
-if $?.success?
-  ENV["BASERUBY"] += ' --disable-gems'
+%w[BASERUBY RUBY MINIRUBY].each do |var|
+  `#{ENV[var]} --disable-gem -e1 2>&1`
+  if $?.success?
+    ENV[var] += ' --disable-gem'
+  end
 end
 
 if $help or $_help