diff --git a/ChangeLog b/ChangeLog
index f89dfc12c1..39eb848292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  8 17:40:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): use the bindir of each gemspec instead
+	  of hardcoded 'bin', since rdoc 5.0.0 overrides it.
+
 Thu Sep  8 16:47:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index ab61a0256e..a012d840f5 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -727,7 +727,7 @@ install?(:ext, :comm, :gem) do
     end
 
     unless gemspec.executables.empty? then
-      bin_dir = File.join(gem_dir, 'gems', full_name, 'bin')
+      bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir)
       makedirs(bin_dir)
 
       execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)}