diff --git a/windows/wscript b/windows/wscript
index ea4dd3d9..ec17887f 100644
--- a/windows/wscript
+++ b/windows/wscript
@@ -1,10 +1,6 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
-def configure(conf):
-    conf.check_cfg(package='portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19', args='--cflags --libs')
-    conf.env['BUILD_DRIVER_PORTAUDIO'] = conf.is_defined('HAVE_PORTAUDIO')
-
 def create_jack_driver_obj(bld, target, sources, uselib = None):
     driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
     driver.env['cxxshlib_PATTERN'] = 'jack_%s.dll'
diff --git a/wscript b/wscript
index 0fe010b2..9e7af263 100644
--- a/wscript
+++ b/wscript
@@ -399,7 +399,9 @@ def options(opt):
     iio = add_auto_option(opt, 'iio', help='Enable IIO driver', conf_dest='BUILD_DRIVER_IIO')
     iio.add_package('gtkIOStream', atleast_version='1.4.0')
     iio.add_package('eigen3', atleast_version='3.1.2')
-    opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver')
+    portaudio = add_auto_option(opt, 'portaudio', help='Enable Portaudio driver', conf_dest='BUILD_DRIVER_PORTAUDIO')
+    portaudio.add_header('windows.h') # only build portaudio on windows
+    portaudio.add_package('portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19')
     opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver')
 
     # dbus options
@@ -467,10 +469,7 @@ def configure(conf):
     if conf.env['IS_LINUX']:
         conf.sub_config('linux')
     if conf.env['IS_WINDOWS']:
-        conf.sub_config('windows')
-        if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']:
-            conf.fatal('Portaudio driver was explicitly requested but cannot be built')
-        conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme
+         conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme
     if Options.options.dbus:
         conf.sub_config('dbus')
         if conf.env['BUILD_JACKDBUS'] != True:
@@ -663,7 +662,6 @@ def configure(conf):
 
     if conf.env['IS_WINDOWS']:
         display_feature('Build with WinMME support', conf.env['BUILD_DRIVER_WINMME'] == True)
-        display_feature('Build with Portaudio support', conf.env['BUILD_DRIVER_PORTAUDIO'] == True)
 
     if conf.env['BUILD_JACKDBUS'] == True:
         display_msg('D-Bus service install directory', conf.env['DBUS_SERVICES_DIR'], 'CYAN')