diff --git a/ChangeLog b/ChangeLog
index 98fe689a74..e538a5db28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 12 18:59:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
+
 Sun Mar 11 00:55:31 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/mkmf.rb (install_rb): fix handling of destination path.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f3438fbac8..4692ea73c1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -354,6 +354,8 @@ def dir_config(target, idefault=nil, ldefault=nil)
 end
 
 def create_makefile(target, srcdir = File.dirname($0))
+  save_libs = $libs.dup
+  save_libpath = $LIBPATH.dup
   print "creating Makefile\n"
   rm_f "conftest*"
   STDOUT.flush
@@ -540,6 +542,8 @@ EOMF
     dfile.close
   end
   mfile.close
+  $libs = save_libs
+  $LIBPATH = save_libpath
 end
 
 $OBJEXT = CONFIG["OBJEXT"]
diff --git a/version.h b/version.h
index 0736027bc1..1db52f34c9 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.6.3"
-#define RUBY_RELEASE_DATE "2001-03-10"
+#define RUBY_RELEASE_DATE "2001-03-12"
 #define RUBY_VERSION_CODE 163
-#define RUBY_RELEASE_CODE 20010310
+#define RUBY_RELEASE_CODE 20010312