diff --git a/ChangeLog b/ChangeLog
index b4296478b9..3cf8e0ff59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Fri Aug  8 16:15:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  8 16:44:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (srcs-enc): renamed from transcodes.
+
+	* enc/Makefile.in (make-workdir): creates object directories.
 
 	* common.mk (encdb.h): see both $(srcdir)/enc and enc.
 
diff --git a/common.mk b/common.mk
index 56a40c99c0..ad40ce4174 100644
--- a/common.mk
+++ b/common.mk
@@ -377,7 +377,6 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
 encs: enc.mk $(LIBRUBY) $(PREP)
-	$(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc" enc
 	$(MAKE) -f enc.mk RUBY="$(MINIRUBY)" $(MFLAGS)
 
 enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
@@ -666,10 +665,9 @@ vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
 
 vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c transcodes
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c srcs-enc
 
-transcodes: enc.mk
-	$(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans
+srcs-enc: enc.mk
 	$(MAKE) -f enc.mk RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
 
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h
@@ -683,7 +681,7 @@ encdb.h: $(PREP)
 	$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $@.new $(srcdir)/enc enc
 	$(IFCHANGE) "$@" "$@.new"
 
-transdb.h: $(PREP) transcodes
+transdb.h: $(PREP) srcs-enc
 	$(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $@.new $(srcdir)/enc/trans enc/trans
 	$(IFCHANGE) "$@" "$@.new"
 
diff --git a/enc/Makefile.in b/enc/Makefile.in
index be2b518588..103ad6b9ae 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -43,11 +43,16 @@ dldflags = @DLDFLAGS@
 archflag = @ARCH_FLAG@
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 
+WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
+
 RM = @RM@
 
 .SUFFIXES: .erb.c
 
-all:
+all srcs: make-workdir
+
+make-workdir:
+	$(MINIRUBY) -run -e mkdir -- -p $(WORKDIRS)
 
 clean: