diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 21892574fe..008b0f4884 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -403,8 +403,6 @@ def build(bld):
         # 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',
                 )
diff --git a/wscript b/wscript
index 12295f56c0..0ba30eba4f 100644
--- a/wscript
+++ b/wscript
@@ -407,7 +407,7 @@ def set_compiler_flags (conf,opt):
         conf.env.append_value('CXXFLAGS', optimization_flags)
 
     if opt.backtrace:
-        if platform != 'darwin' and not is_clang:
+        if platform != 'darwin' and not is_clang and not Options.options.dist_target == 'mingw':
             linker_flags += [ '-rdynamic' ]
 
     conf.env.append_value('CFLAGS', compiler_flags)