diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index e7f6cc6946..aef7270a2b 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -356,7 +356,8 @@ def build(bld):
 
     VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
 
-    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+    if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
+        # Windows VST support w/wine
         # If we require VST support we build a stub main() and the FST library
         # here using winegcc, and link it to the GTK front-end library
         obj = bld (features = 'cxx c cxxprogram wine')
@@ -382,7 +383,7 @@ def build(bld):
                              ]
         obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
-        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-L/usr/lib/i386-linux-gnu/wine-unstable/']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
         obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
         # end of the wine executable
@@ -400,6 +401,17 @@ def build(bld):
         obj.target = 'ardour-' + bld.env['VERSION']
         obj.includes = ['.']
 
+        if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        # Windows VST support mingw
+            obj.source += (
+                '../libs/fst/fst.c',
+                '../libs/fst/fstinfofile.c',
+                '../libs/fst/vsti.c',
+                '../libs/fst/vstwin.c',
+                '../vst/winmain.c',
+                )
+            obj.includes += [ '../libs/fst' ]
+
     # at this point, "obj" refers to either the normal native executable
     # OR the shared library built for use with wine on linux.
 
@@ -432,7 +444,7 @@ def build(bld):
     obj.includes += ['../libs']
 
     if bld.env['build_target'] == 'mingw':
-	if bld.env['DEBUG'] == False:
+        if bld.env['DEBUG'] == False:
             obj.linkflags = ['-mwindows']
 
     if bld.is_defined('HAVE_SUIL'):