diff --git a/ChangeLog b/ChangeLog
index 62c1579d72..f2e1be4102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Oct 17 16:17:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 17 16:20:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/configure.bat: add option to enable/disable to install
+	  static ruby library.  defaulted to "no".  [Feature #12845]
 
 	* configure.in (install-static-library): add option to enable/
 	  disable to install static ruby library.  defaulted to "no" if
diff --git a/win32/configure.bat b/win32/configure.bat
index 98c8af3d65..dca517e4f4 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -30,6 +30,8 @@ if "%1" == "--install-name" goto :installname
 if "%1" == "--so-name" goto :soname
 if "%1" == "--enable-install-doc" goto :enable-rdoc
 if "%1" == "--disable-install-doc" goto :disable-rdoc
+if "%1" == "--enable-install-static-library" goto :enable-lib
+if "%1" == "--disable-install-static-library" goto :disable-lib
 if "%1" == "--enable-debug-env" goto :enable-debug-env
 if "%1" == "--disable-debug-env" goto :disable-debug-env
 if "%1" == "--enable-rubygems" goto :enable-rubygems
@@ -117,6 +119,16 @@ goto :loop ;
   echo>>confargs.tmp %1 \
   shift
 goto :loop ;
+:enable-lib
+  echo>> ~tmp~.mak 	"INSTALL_STATIC_LIBRARY=yes" \
+  echo>>confargs.tmp %1 \
+  shift
+goto :loop ;
+:disable-lib
+  echo>> ~tmp~.mak 	"INSTALL_STATIC_LIBRARY=no" \
+  echo>>confargs.tmp %1 \
+  shift
+goto :loop ;
 :enable-debug-env
   echo>> ~tmp~.mak 	"ENABLE_DEBUG_ENV=yes" \
   echo>>confargs.tmp %1 \