diff --git a/AUTHORS.md b/AUTHORS.md
@@ -16,6 +16,7 @@
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
 -   Christian Heimes ([@tiran](https://github.com/tiran))
 -   Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
+-   Christopher Pow ([@christopherpow](https://github.com/christopherpow))
 -   Daniel Fernandez ([@fdanny](https://github.com/fdanny))
 -   Daniel Santana ([@dgsantana](https://github.com/dgsantana))
 -   David Lechner ([@dlech](https://github.com/dlech))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 
 ### Fixed
 
+-   Fixed Visual Studio 2017 compat (#434) for setup.py
 -   Fixed `FooBar` bug
 
 ## [2.3.0][] - 2017-03-11

diff --git a/conda.recipe/bld.bat b/conda.recipe/bld.bat
@@ -1,6 +1,6 @@
 :: build it
 
 :: set path to modern MSBuild
-set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
 
 %PYTHON% setup.py install
diff --git a/setup.py b/setup.py
@@ -65,6 +65,9 @@
 )
 
 VS_KEYS = (
+    RegKey(sdk_name="MSBuild 15", key=vs_root.format("15.0"),
+           value_name="MSBuildToolsPath", suffix=""),
+
     RegKey(sdk_name="MSBuild 14", key=vs_root.format("14.0"),
            value_name="MSBuildToolsPath", suffix=""),