diff --git a/ChangeLog b/ChangeLog
index 3658660311..ea65fe27a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 25 17:34:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_substr_append): fix for buffer overrun.
+
 Mon Aug 25 14:22:21 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* parse.y (YYSTYPE): struct RVarmap has been no longer 
diff --git a/win32/enc-setup.mak b/win32/enc-setup.mak
index bc4df0fdc4..44345a2f45 100644
--- a/win32/enc-setup.mak
+++ b/win32/enc-setup.mak
@@ -1,6 +1,10 @@
-BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
+encs: BUILTIN_ENCOBJS BUILTIN_TRANSOBJS
+BUILTIN_ENCOBJS BUILTIN_TRANSOBJS: $(srcdir)/enc/Makefile.in
 
 !include $(srcdir)/enc/Makefile.in
 
 BUILTIN_ENCOBJS:
 	@echo BUILTIN_ENCOBJS = $(BUILTIN_ENCS:.c=.obj) >> $(MAKEFILE)
+
+BUILTIN_TRANSOBJS:
+	@echo BUILTIN_TRANSOBJS = $(BUILTIN_TRANSES:.trans=.obj) >> $(MAKEFILE)