From 38bc97bd3e0f332423531bbe137ac7cfaf00cac8 Mon Sep 17 00:00:00 2001
From: pingzing <mcalistern@gmail.com>
Date: Sun, 13 Mar 2016 19:36:58 +0200
Subject: [PATCH 1/2] Clarify windows build instructions

---
 README.md | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5741e2c1..90926ada 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,30 @@ export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib
 On Windows, consider building with [mingw-w64](http://mingw-w64.org/).
 Build script will try to find mingw in `PATH` environment variable to provide
 Cargo with location where openssl libs from mingw-w64 package may be found.
-If you followed guide [Building on Windows](https://github.com/rust-lang/rust#building-on-windows)
-from rust repo, then you should have [MSYS2](http://msys2.github.io/) with
-`mingw-w64-openssl` installed as part of `mingw-w64-x86_64-toolchain`
-(or `mingw-w64-i686-toolchain`) package.
+
+mingw-w64 can be easily installed by using [MSYS2](http://msys2.github.io/). Install MSYS2 according to the instructions, and then, from an MSYS2 Shell, install mingw-w64:
+
+32-bit:
+```bash
+pacman -S mingw-w64-i686-gcc
+``` 
+
+64-bit
+```bash
+pacman -S mingw-w64-x86_64-gcc
+```
+
+and then install the mingw-w64 toolchain.
+
+32-bit:
+```bash
+pacman -S mingw-w64-x86_64-toolchain
+```
+
+64-bit:
+```bash
+pacman -S mingw-w64-i686-toolchain
+```
 
 Alternatively, install OpenSSL from [here][1]. Cargo will not be able to find OpenSSL if it's
 installed to the default location. You can either copy the `include/openssl`

From f615626d08314714e505dd18eb5935c085abbadd Mon Sep 17 00:00:00 2001
From: pingzing <mcalistern@gmail.com>
Date: Mon, 14 Mar 2016 02:12:32 +0200
Subject: [PATCH 2/2] Fix order of 32- and 64-bit for mingw toolchain

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 90926ada..bdc8fc2c 100644
--- a/README.md
+++ b/README.md
@@ -61,12 +61,12 @@ and then install the mingw-w64 toolchain.
 
 32-bit:
 ```bash
-pacman -S mingw-w64-x86_64-toolchain
+pacman -S mingw-w64-i686-toolchain
 ```
 
 64-bit:
 ```bash
-pacman -S mingw-w64-i686-toolchain
+pacman -S mingw-w64-x86_64-toolchain
 ```
 
 Alternatively, install OpenSSL from [here][1]. Cargo will not be able to find OpenSSL if it's