diff --git a/ChangeLog b/ChangeLog
index 2fd02fe05f..2be0219515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 28 14:57:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
+	  DOSISH compilers.  [ruby-core:03107]
+
 Mon Jun 28 00:35:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
diff --git a/configure.in b/configure.in
index 09bedbf6be..0a4e2fd830 100644
--- a/configure.in
+++ b/configure.in
@@ -808,7 +808,7 @@ AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 
 STATIC=
-: ${LIBPATHFLAG=" -L'%s'"}
+: ${LIBPATHFLAG=' -L"%s"'}
 : ${PATHFLAG=''}
 
 if test "$with_dln_a_out" != yes; then
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f02a006f13..2dae281623 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1093,7 +1093,7 @@ LINK_SO = config_string('LINK_SO') ||
     "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$@ " \
     "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
   end
-LIBPATHFLAG = config_string('LIBPATHFLAG') || " -L'%s'"
+LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
 RPATHFLAG = config_string('RPATHFLAG') || ''
 LIBARG = config_string('LIBARG') || '-l%s'