diff --git a/ChangeLog b/ChangeLog
index 84f622d093..4b817a414d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 13 20:44:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (update-gems): chdir to the target directory and then
+	  add the tool directory to load paths, for older BASERUBY.
+	  [Bug #10372][ruby-core:65630]
+
 Mon Oct 13 17:53:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem.
diff --git a/common.mk b/common.mk
index ce5f830ea6..ce01aca00f 100644
--- a/common.mk
+++ b/common.mk
@@ -1082,8 +1082,8 @@ update-config_files: PHONY
 
 update-gems: PHONY
 	$(ECHO) Downloading bundled gem files...
-	$(Q) $(RUNRUBY) -I$(srcdir)/tool -rdownloader -answ \
-	    -C "$(srcdir)/gems" \
+	$(Q) $(RUNRUBY) -C "$(srcdir)/gems" \
+	    -I../tool -rdownloader -answ \
 	    -e 'gem, ver = *$$F' \
 	    -e 'gem = "#{gem}-#{ver}.gem"' \
 	    -e 'Downloader::RubyGems.download(gem)' \