diff --git a/ChangeLog b/ChangeLog
index 33aabb40c6..bb729dc31a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 20 03:56:58 2015  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* enc/make_encmake.rb: the list of encoding extension libraries must
+	  not include encinit.c itself.  It caused "undefined reference to
+	  Init_encinit".
+
 Sat Jun 20 02:03:53 2015  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* process.c (rb_execarg_parent_start1): new macro ALWAYS_NEED_ENVP
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index 2342317b21..831b0e1962 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -51,7 +51,7 @@ end
 
 ALPHANUMERIC_ORDER = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
 def target_encodings
-  encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c"]
+  encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c", "encinit.c"]
   encs.each {|e| e.chomp!(".c")}
   encs.reject! {|e| !ENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !ENC_PATTERNS.empty?
   encs.reject! {|e| NOENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}}