diff --git a/ChangeLog b/ChangeLog
index c269549f31..22097b5251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 30 17:02:55 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set target_cpu to i386 on cygwin and mingw32.
+
 Fri Nov 30 00:25:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
 
 	* README.EXT: Appendix B is duplicated.
diff --git a/configure.in b/configure.in
index 83a90037d9..46155c3ec5 100644
--- a/configure.in
+++ b/configure.in
@@ -111,6 +111,8 @@ cygwin*|mingw*)
     AC_CHECK_TOOL(AS, as)
     AC_CHECK_TOOL(DLLTOOL, dlltool)
     AC_CHECK_TOOL(WINDRES, windres)
+    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    : ${enable_shared=yes}
     ;;
 esac
 
@@ -856,7 +858,7 @@ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
 LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so'
 ENABLE_SHARED=no
 
-AC_ARG_ENABLE(enable-shared,
+AC_ARG_ENABLE(shared,
        [--enable-shared           build a shared library for Ruby. ],
        [enable_shared=$enableval])
 if test "$enable_shared" = 'yes'; then