diff --git a/ChangeLog b/ChangeLog
index b5b15bd985..8099ac6b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 09:19:27 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
+	  library for SH* functions on mswin32 and mingw32.
+
 Thu Aug 19 03:07:00 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
diff --git a/configure.in b/configure.in
index 453a61e5c4..89a9ba8068 100644
--- a/configure.in
+++ b/configure.in
@@ -291,7 +291,7 @@ cygwin*)	rb_cv_have_daylight=no
 		ac_cv_func__setjmp=no
 		ac_cv_func_setitimer=no
 		;;
-mingw*)		LIBS="-lwsock32 $LIBS"
+mingw*)		LIBS="-lshell32 -lwsock32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 53b161e7aa..4717b1572a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -125,7 +125,7 @@ RFLAGS = -r
 !if !defined(EXTLIBS)
 EXTLIBS =
 !endif
-LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS)
+LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(EXTLIBS)
 MISSING = acosh.obj crypt.obj erf.obj win32.obj
 
 ARFLAGS = -machine:$(MACHINE) -out: