diff --git a/ChangeLog b/ChangeLog
index 0ce3ee51bf..18e1b0af2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 24 10:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: sitearch should use target_cpu.  [ruby-core:15986]
+
 Mon Mar 24 01:24:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
diff --git a/configure.in b/configure.in
index c8fdca42d1..6a538b66e1 100644
--- a/configure.in
+++ b/configure.in
@@ -1675,7 +1675,7 @@ else
 fi
 
 case "$target_os" in
-  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
+  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
   *) sitearch="${arch}" ;;
 esac
 
diff --git a/version.h b/version.h
index 3160597915..34c1bcafd4 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-21"
+#define RUBY_RELEASE_DATE "2008-03-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080321
+#define RUBY_RELEASE_CODE 20080324
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];