diff --git a/android/build.gradle b/android/build.gradle
index 56f58fe23b..a545eb0129 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -108,16 +108,20 @@ dependencies {
 
 def run(cmd) {
   def stdout = new ByteArrayOutputStream()
-  exec{
+  exec {
     commandLine = cmd
     standardOutput = stdout
   }
   return stdout.toString()
 }
 
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 def getVersion() {
-  def versionCode = Integer.parseInt(run(['../tools/unix/version.sh', 'android_code']).trim())
-  def versionName = run(['../tools/unix/version.sh', 'android_name']).trim()
+  def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows()
+  def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash'
+  def versionCode = Integer.parseInt(run([bash, '../tools/unix/version.sh', 'android_code']).trim())
+  def versionName = run([bash, '../tools/unix/version.sh', 'android_name']).trim()
   return new groovy.lang.Tuple2(versionCode, versionName)
 }
 
diff --git a/configure.sh b/configure.sh
index 7d4742767d..691e6908b5 100755
--- a/configure.sh
+++ b/configure.sh
@@ -129,7 +129,16 @@ if [ ! -d "$BASE_PATH/3party/boost/tools" ]; then
   echo "Try 'git submodule update --init --recursive'"
   exit 1
 fi
+
 cd "$BASE_PATH/3party/boost/"
-./bootstrap.sh
-./b2 headers
+if [[ "$OSTYPE" == msys ]]; then
+  echo "For Windows please run:"
+  echo "cd 3party\\boost"
+  echo "bootstrap.bat"
+  echo "b2 headers"
+  echo "cd ..\\.."
+else
+  ./bootstrap.sh
+  ./b2 headers
+fi
 cd "$BASE_PATH"