diff --git a/ChangeLog b/ChangeLog
index 7cb55436ae..6d96669bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 15 14:57:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
+	  to get rid of ./ruby.exe.
+
+	* win32/enc-setup.mak: workaround for Borland make.
+
 Tue Jan 15 14:44:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 0e0bb45d09..1cc87f3e80 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -15,7 +15,7 @@ prefix = /usr
 OS = bccwin32
 RT = $(OS)
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -42,7 +42,15 @@ $(BANG)endif
 $(BANG)ifndef prefix
 prefix = $(prefix:\=/)
 $(BANG)endif
+$(BANG)if !defined(BASERUBY)
+!if defined(BASERUBY)
+BASERUBY = $(BASERUBY)
+!endif
 |
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+!endif
+	@$(APPEND) $(BANG)endif
 !if exist(confargs.mk)
 	@type confargs.mk >> $(MAKEFILE)
 	@del confargs.mk
diff --git a/win32/enc-setup.mak b/win32/enc-setup.mak
index 2b51c4bf66..bc4df0fdc4 100644
--- a/win32/enc-setup.mak
+++ b/win32/enc-setup.mak
@@ -1,6 +1,6 @@
-BUILTIN_ENCOBJS:
+BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
 
 !include $(srcdir)/enc/Makefile.in
 
-BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
+BUILTIN_ENCOBJS:
 	@echo BUILTIN_ENCOBJS = $(BUILTIN_ENCS:.c=.obj) >> $(MAKEFILE)
diff --git a/win32/setup.mak b/win32/setup.mak
index 205f1f956a..455b6ae83d 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -13,7 +13,7 @@ srcdir = $(WIN32DIR)/..
 prefix = /usr
 !endif
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -56,6 +56,9 @@ EXTOUT = $(EXTOUT)
 BASERUBY = $(BASERUBY)
 !endif
 <<
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+!endif
 
 -system-vars-: -runtime-