diff --git a/.gitignore b/.gitignore
index 6748492014..b62fa53e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 gyp/test
 node_modules
 test/.node-gyp
+!test/node_modules
+build/
diff --git a/lib/Find-VS2017.cs b/lib/Find-VS2017.cs
deleted file mode 100644
index a41a354f61..0000000000
--- a/lib/Find-VS2017.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2017 - Refael Ackermann
-// Distributed under MIT style license
-// See accompanying file LICENSE at https://github.com/node4good/windows-autoconf
-
-// Usage:
-// powershell -ExecutionPolicy Unrestricted -Version "2.0" -Command "&{Add-Type -Path Find-VS2017.cs; [VisualStudioConfiguration.Main]::Query()}"
-using System;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace VisualStudioConfiguration
-{
-    [Flags]
-    public enum InstanceState : uint
-    {
-        None = 0,
-        Local = 1,
-        Registered = 2,
-        NoRebootRequired = 4,
-        NoErrors = 8,
-        Complete = 4294967295,
-    }
-
-    [Guid("6380BCFF-41D3-4B2E-8B2E-BF8A6810C848")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface IEnumSetupInstances
-    {
-
-        void Next([MarshalAs(UnmanagedType.U4), In] int celt,
-            [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.Interface), Out] ISetupInstance[] rgelt,
-            [MarshalAs(UnmanagedType.U4)] out int pceltFetched);
-
-        void Skip([MarshalAs(UnmanagedType.U4), In] int celt);
-
-        void Reset();
-
-        [return: MarshalAs(UnmanagedType.Interface)]
-        IEnumSetupInstances Clone();
-    }
-
-    [Guid("42843719-DB4C-46C2-8E7C-64F1816EFD5B")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupConfiguration
-    {
-    }
-
-    [Guid("26AAB78C-4A60-49D6-AF3B-3C35BC93365D")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupConfiguration2 : ISetupConfiguration
-    {
-
-        [return: MarshalAs(UnmanagedType.Interface)]
-        IEnumSetupInstances EnumInstances();
-
-        [return: MarshalAs(UnmanagedType.Interface)]
-        ISetupInstance GetInstanceForCurrentProcess();
-
-        [return: MarshalAs(UnmanagedType.Interface)]
-        ISetupInstance GetInstanceForPath([MarshalAs(UnmanagedType.LPWStr), In] string path);
-
-        [return: MarshalAs(UnmanagedType.Interface)]
-        IEnumSetupInstances EnumAllInstances();
-    }
-
-    [Guid("B41463C3-8866-43B5-BC33-2B0676F7F42E")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupInstance
-    {
-    }
-
-    [Guid("89143C9A-05AF-49B0-B717-72E218A2185C")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupInstance2 : ISetupInstance
-    {
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetInstanceId();
-
-        [return: MarshalAs(UnmanagedType.Struct)]
-        System.Runtime.InteropServices.ComTypes.FILETIME GetInstallDate();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetInstallationName();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetInstallationPath();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetInstallationVersion();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetDisplayName([MarshalAs(UnmanagedType.U4), In] int lcid);
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetDescription([MarshalAs(UnmanagedType.U4), In] int lcid);
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string ResolvePath([MarshalAs(UnmanagedType.LPWStr), In] string pwszRelativePath);
-
-        [return: MarshalAs(UnmanagedType.U4)]
-        InstanceState GetState();
-
-        [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_UNKNOWN)]
-        ISetupPackageReference[] GetPackages();
-
-        ISetupPackageReference GetProduct();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetProductPath();
-
-        [return: MarshalAs(UnmanagedType.VariantBool)]
-        bool IsLaunchable();
-
-        [return: MarshalAs(UnmanagedType.VariantBool)]
-        bool IsComplete();
-
-        [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_UNKNOWN)]
-        ISetupPropertyStore GetProperties();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetEnginePath();
-    }
-
-    [Guid("DA8D8A16-B2B6-4487-A2F1-594CCCCD6BF5")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupPackageReference
-    {
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetId();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetVersion();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetChip();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetLanguage();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetBranch();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetType();
-
-        [return: MarshalAs(UnmanagedType.BStr)]
-        string GetUniqueId();
-
-        [return: MarshalAs(UnmanagedType.VariantBool)]
-        bool GetIsExtension();
-    }
-
-    [Guid("c601c175-a3be-44bc-91f6-4568d230fc83")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    public interface ISetupPropertyStore
-    {
-
-        [return: MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_BSTR)]
-        string[] GetNames();
-
-        object GetValue([MarshalAs(UnmanagedType.LPWStr), In] string pwszName);
-    }
-
-    [Guid("42843719-DB4C-46C2-8E7C-64F1816EFD5B")]
-    [CoClass(typeof(SetupConfigurationClass))]
-    [ComImport]
-    public interface SetupConfiguration : ISetupConfiguration2, ISetupConfiguration
-    {
-    }
-
-    [Guid("177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D")]
-    [ClassInterface(ClassInterfaceType.None)]
-    [ComImport]
-    public class SetupConfigurationClass
-    {
-    }
-
-    public static class Main
-    {
-        public static void Query()
-        {
-            ISetupConfiguration query = new SetupConfiguration();
-            ISetupConfiguration2 query2 = (ISetupConfiguration2)query;
-            IEnumSetupInstances e = query2.EnumAllInstances();
-
-            int pceltFetched;
-            ISetupInstance2[] rgelt = new ISetupInstance2[1];
-            StringBuilder log = new StringBuilder();
-            while (true)
-            {
-                e.Next(1, rgelt, out pceltFetched);
-                if (pceltFetched <= 0)
-                {
-                    Console.WriteLine(String.Format("{{\"log\":\"{0}\"}}", log.ToString()));
-                    return;
-                }
-                if (CheckInstance(rgelt[0], ref log))
-                    return;
-            }
-        }
-
-        private static bool CheckInstance(ISetupInstance2 setupInstance2, ref StringBuilder log)
-        {
-            // Visual Studio Community 2017 component directory:
-            // https://www.visualstudio.com/en-us/productinfo/vs2017-install-product-Community.workloads
-
-            string path = setupInstance2.GetInstallationPath().Replace("\\", "\\\\");
-            log.Append(String.Format("Found installation at: {0}\\n", path));
-
-            bool hasMSBuild = false;
-            bool hasVCTools = false;
-            uint Win10SDKVer = 0;
-            bool hasWin8SDK = false;
-
-            foreach (ISetupPackageReference package in setupInstance2.GetPackages())
-            {
-                const string Win10SDKPrefix = "Microsoft.VisualStudio.Component.Windows10SDK.";
-
-                string id = package.GetId();
-                if (id == "Microsoft.VisualStudio.VC.MSBuild.Base")
-                    hasMSBuild = true;
-                else if (id == "Microsoft.VisualStudio.Component.VC.Tools.x86.x64")
-                    hasVCTools = true;
-                else if (id.StartsWith(Win10SDKPrefix))
-                    Win10SDKVer = Math.Max(Win10SDKVer, UInt32.Parse(id.Substring(Win10SDKPrefix.Length)));
-                else if (id == "Microsoft.VisualStudio.Component.Windows81SDK")
-                    hasWin8SDK = true;
-                else
-                    continue;
-
-                log.Append(String.Format("  - Found {0}\\n", id));
-            }
-
-            if (!hasMSBuild)
-                log.Append("  - Missing Visual Studio C++ core features (Microsoft.VisualStudio.VC.MSBuild.Base)\\n");
-            if (!hasVCTools)
-                log.Append("  - Missing VC++ 2017 v141 toolset (x86,x64) (Microsoft.VisualStudio.Component.VC.Tools.x86.x64)\\n");
-            if ((Win10SDKVer == 0) && (!hasWin8SDK))
-                log.Append("  - Missing a Windows SDK (Microsoft.VisualStudio.Component.Windows10SDK.* or Microsoft.VisualStudio.Component.Windows81SDK)\\n");
-
-            if (hasMSBuild && hasVCTools)
-            {
-                if (Win10SDKVer > 0)
-                {
-                    log.Append("  - Using this installation with Windows 10 SDK"/*\\n*/);
-                    Console.WriteLine(String.Format("{{\"log\":\"{0}\",\"path\":\"{1}\",\"sdk\":\"10.0.{2}.0\"}}", log.ToString(), path, Win10SDKVer));
-                    return true;
-                }
-                else if (hasWin8SDK)
-                {
-                    log.Append("  - Using this installation with Windows 8.1 SDK"/*\\n*/);
-                    Console.WriteLine(String.Format("{{\"log\":\"{0}\",\"path\":\"{1}\",\"sdk\":\"8.1\"}}", log.ToString(), path));
-                    return true;
-                }
-            }
-
-            log.Append("  - Some required components are missing, not using this installation\\n");
-            return false;
-        }
-    }
-}
diff --git a/lib/build.js b/lib/build.js
index 5253109857..1723de7e87 100644
--- a/lib/build.js
+++ b/lib/build.js
@@ -14,7 +14,9 @@ var fs = require('graceful-fs')
   , mkdirp = require('mkdirp')
   , exec = require('child_process').exec
   , processRelease = require('./process-release')
-  , win = process.platform === 'win32'
+  , win = process.platform === 'win32';
+if (win)
+  var autoconf = require('windows-autoconf')
 
 exports.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module'
 
@@ -106,7 +108,7 @@ function build (gyp, argv, callback) {
     which(command, function (err, execPath) {
       if (err) {
         if (win && /not found/.test(err.message)) {
-          // On windows and no 'msbuild' found. Let's guess where it is
+          log.verbose('could not find "msbuild.exe" in PATH - finding location in registry')
           findMsbuild()
         } else {
           // Some other error or 'make' not found on Unix, report that to the user
@@ -122,68 +124,18 @@ function build (gyp, argv, callback) {
   /**
    * Search for the location of "msbuild.exe" file on Windows.
    */
-
   function findMsbuild () {
-    if (config.variables.msbuild_path) {
-      command = config.variables.msbuild_path
-      log.verbose('using MSBuild:', command)
-      copyNodeLib()
-      return
-    }
-
-    log.verbose('could not find "msbuild.exe" in PATH - finding location in registry')
-    var notfoundErr = 'Can\'t find "msbuild.exe". Do you have Microsoft Visual Studio C++ 2008+ installed?'
-    var cmd = 'reg query "HKLM\\Software\\Microsoft\\MSBuild\\ToolsVersions" /s'
-    if (process.arch !== 'ia32')
-      cmd += ' /reg:32'
-    exec(cmd, function (err, stdout, stderr) {
-      if (err) {
-        return callback(new Error(err.message + '\n' + notfoundErr))
+    var notfoundErr = 'Can\'t find "msbuild.exe". Do you have Microsoft Visual Studio installed?'
+    try {
+      var msbuild_path = autoconf.locateMsbuild()
+      if (!msbuild_path) {
+        return callback(new Error(notfoundErr))
       }
-      var reVers = /ToolsVersions\\([^\\]+)$/i
-        , rePath = /\r\n[ \t]+MSBuildToolsPath[ \t]+REG_SZ[ \t]+([^\r]+)/i
-        , msbuilds = []
-        , r
-        , msbuildPath
-      stdout.split('\r\n\r\n').forEach(function(l) {
-        if (!l) return
-        l = l.trim()
-        if (r = reVers.exec(l.substring(0, l.indexOf('\r\n')))) {
-          var ver = parseFloat(r[1], 10)
-          if (ver >= 3.5) {
-            if (r = rePath.exec(l)) {
-              msbuilds.push({
-                version: ver,
-                path: r[1]
-              })
-            }
-          }
-        }
-      })
-      msbuilds.sort(function (x, y) {
-        return (x.version < y.version ? -1 : 1)
-      })
-      ;(function verifyMsbuild () {
-        if (!msbuilds.length) return callback(new Error(notfoundErr))
-        msbuildPath = path.resolve(msbuilds.pop().path, 'msbuild.exe')
-        fs.stat(msbuildPath, function (err, stat) {
-          if (err) {
-            if (err.code == 'ENOENT') {
-              if (msbuilds.length) {
-                return verifyMsbuild()
-              } else {
-                callback(new Error(notfoundErr))
-              }
-            } else {
-              callback(err)
-            }
-            return
-          }
-          command = msbuildPath
-          copyNodeLib()
-        })
-      })()
-    })
+    } catch (e) {
+      return callback(new Error(err.message + '\n' + notfoundErr))
+    }
+    command = msbuild_path
+    copyNodeLib()
   }
 
   /**
diff --git a/lib/configure.js b/lib/configure.js
index 3349e9fedf..6961a1487f 100644
--- a/lib/configure.js
+++ b/lib/configure.js
@@ -23,7 +23,7 @@ var fs = require('graceful-fs')
   , findNodeDirectory = require('./find-node-directory')
   , msgFormat = require('util').format
 if (win)
-  var findVS2017 = require('./find-vs2017')
+  var findVS = require('windows-autoconf')
 
 exports.usage = 'Generates ' + (win ? 'MSVC project files' : 'a Makefile') + ' for the current module'
 
@@ -41,15 +41,13 @@ function configure (gyp, argv, callback) {
       callback(err)
     } else {
       python = found
+      // 'python' should be set by now
+      process.env.PYTHON = python
       getNodeDir()
     }
   })
 
   function getNodeDir () {
-
-    // 'python' should be set by now
-    process.env.PYTHON = python
-
     if (gyp.opts.nodedir) {
       // --nodedir was specified. use that for the dev files
       nodeDir = gyp.opts.nodedir.replace(/^~/, osenv.home())
@@ -88,22 +86,29 @@ function configure (gyp, argv, callback) {
     mkdirp(buildDir, function (err, isNew) {
       if (err) return callback(err)
       log.verbose('build dir', '"build" dir needed to be created?', isNew)
-      if (win && (!gyp.opts.msvs_version || gyp.opts.msvs_version === '2017')) {
-        findVS2017(function (err, vsSetup) {
-          if (err) {
-            log.verbose('Not using VS2017:', err.message)
-            createConfigFile()
-          } else {
-            createConfigFile(null, vsSetup)
-          }
-        })
-      } else {
-        createConfigFile()
-      }
+      createConfigFile()
     })
   }
 
-  function createConfigFile (err, vsSetup) {
+  function findVisualStudio2017 (defaults) {
+    if (gyp.opts.msvs_version && gyp.opts.msvs_version !== '2017')
+      return
+
+    try {
+      var vsSetup = findVS.getVS2017Setup()
+      if (!vsSetup || !vsSetup.InstallationPath) return
+    } catch (_) {
+      return
+    }
+
+    gyp.opts.msvs_version = '2015'
+    process.env['GYP_MSVS_VERSION'] = 2015
+    process.env['GYP_MSVS_OVERRIDE_PATH'] = vsSetup.InstallationPath
+    defaults['msbuild_toolset'] = 'v141'
+    defaults['msvs_windows_target_platform_version'] = vsSetup.SDK
+  }
+
+  function createConfigFile (err) {
     if (err) return callback(err)
 
     var configFilename = 'config.gypi'
@@ -150,18 +155,8 @@ function configure (gyp, argv, callback) {
     // disable -T "thin" static archives by default
     variables.standalone_static_library = gyp.opts.thin ? 0 : 1
 
-    if (vsSetup) {
-      // GYP doesn't (yet) have support for VS2017, so we force it to VS2015
-      // to avoid pulling a floating patch that has not landed upstream.
-      // Ref: https://chromium-review.googlesource.com/#/c/433540/
-      gyp.opts.msvs_version = '2015'
-      process.env['GYP_MSVS_VERSION'] = 2015
-      process.env['GYP_MSVS_OVERRIDE_PATH'] = vsSetup.path
-      defaults['msbuild_toolset'] = 'v141'
-      defaults['msvs_windows_target_platform_version'] = vsSetup.sdk
-      variables['msbuild_path'] = path.join(vsSetup.path, 'MSBuild', '15.0',
-                                            'Bin', 'MSBuild.exe')
-    }
+    if (win)
+      findVisualStudio2017(defaults)
 
     // loop through the rest of the opts and add the unknown ones as variables.
     // this allows for module-specific configure flags like:
@@ -227,7 +222,7 @@ function configure (gyp, argv, callback) {
     }
 
     function hasMsvsVersion () {
-      return argv.some(function (arg) {
+      return argv.find(function (arg) {
         return arg.indexOf('msvs_version') === 0
       })
     }
diff --git a/lib/find-vs2017.js b/lib/find-vs2017.js
deleted file mode 100644
index 8c79e9ec9b..0000000000
--- a/lib/find-vs2017.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var log = require('npmlog')
-  , execFile = require('child_process').execFile
-  , path = require('path')
-
-function findVS2017(callback) {
-  var ps = path.join(process.env.SystemRoot, 'System32', 'WindowsPowerShell',
-                     'v1.0', 'powershell.exe')
-  var csFile = path.join(__dirname, 'Find-VS2017.cs')
-  var psArgs = ['-ExecutionPolicy', 'Unrestricted', '-Command',
-                '&{Add-Type -Path \'' + csFile +
-                '\'; [VisualStudioConfiguration.Main]::Query()}']
-
-  log.silly('find vs2017', 'Running', ps, psArgs)
-  var child = execFile(ps, psArgs, { encoding: 'utf8' },
-           function (err, stdout, stderr) {
-    log.silly('find vs2017', 'PS err:', err)
-    log.silly('find vs2017', 'PS stdout:', stdout)
-    log.silly('find vs2017', 'PS stderr:', stderr)
-
-    if (err)
-      return callback(new Error('Could not use PowerShell to find VS2017'))
-
-    var vsSetup
-    try {
-      vsSetup = JSON.parse(stdout)
-    } catch (e) {
-      log.silly('find vs2017', e)
-      return callback(new Error('Could not use PowerShell to find VS2017'))
-    }
-    log.silly('find vs2017', 'vsSetup:', vsSetup)
-
-    if (vsSetup && vsSetup.log)
-      log.verbose('find vs2017', vsSetup.log.trimRight())
-
-    if (!vsSetup || !vsSetup.path || !vsSetup.sdk) {
-      return callback(new Error('No usable installation of VS2017 found'))
-    }
-
-    log.verbose('find vs2017', 'using installation:', vsSetup.path)
-    callback(null, { "path": vsSetup.path, "sdk": vsSetup.sdk })
-  })
-
-  child.stdin.end()
-}
-
-module.exports = findVS2017
diff --git a/package.json b/package.json
index 3b5071d6ac..ed685dd594 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "rimraf": "2",
     "semver": "~5.3.0",
     "tar": "^2.0.0",
+    "windows-autoconf": "^1.11.1",
     "which": "1"
   },
   "engines": {