diff --git a/ChangeLog b/ChangeLog
index ca738a0c81..c28cd87b65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 28 23:22:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: extract transcode_tblgen method calls for libraries
+	  loaded by dynamically generated names, in single_byte.trans.
+
 Fri Oct 28 16:05:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* insns.def (opt_case_dispatch): extract float value only if the
diff --git a/enc/depend b/enc/depend
index 6053487653..e47349282f 100644
--- a/enc/depend
+++ b/enc/depend
@@ -108,7 +108,11 @@ enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %     src = "#{e}.trans"
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-%     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
+%     trans = IO.read(File.join($srcdir, "trans", src))
+%     src = trans.scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}
+%     if src.empty?
+%       src = trans.scan(/^\s*transcode_tblgen_\w+\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+"-tbl.rb"}
+%     end
 <%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
 %   end