diff --git a/ChangeLog b/ChangeLog
index 4ee29d8e5c..c43acececa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 11 15:11:29 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
+	  [Bug #7541] [ruby-core:50736]
+
 Tue Dec 11 12:00:19 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/dl/win32/extconf.rb: Fix typo
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 2368412260..cc4bc711f9 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -69,6 +69,11 @@ path = ENV["PATH"].split(File::PATH_SEPARATOR)
   end
 end
 
+`#{ENV["BASERUBY"]} --disable-gem -e1 2>&1`
+if $?.success?
+  ENV["BASERUBY"] += ' --disable-gems'
+end
+
 if $help or $_help
   puts usage
   exit