diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 6b5e1b4810..55beca9f05 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -15,6 +15,15 @@ I18N_PACKAGE = 'gtk2_ardour3'
 top = '.'
 out = 'build'
 
+def copyfile(task):
+	src=task.inputs[0].abspath()
+	tgt=task.outputs[0].abspath()
+	if os.path.isfile(tgt) :
+		os.chmod(tgt, Utils.O755);
+	shutil.copy2(src,tgt)
+	if os.path.isfile(tgt) :
+		os.chmod(tgt, Utils.O755);
+
 path_prefix = 'gtk2_ardour/'
 
 gtk2_ardour_sources = [
@@ -383,7 +392,7 @@ def build(bld):
                              'libgtkmm2ext',
                              'libcanvas'
                              ]
-        obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
+        obj.target = 'tracks.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@@ -400,7 +409,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         obj = bld (features = 'cxx c cxxprogram')
         obj.source    = gtk2_ardour_sources
-        obj.target = 'ardour-' + bld.env['VERSION']
+        obj.target = 'tracks'
         obj.includes = ['.']
         obj.ldflags = ['-no-undefined']
 
@@ -489,7 +498,7 @@ def build(bld):
             'SYSCONFDIR'     : os.path.normpath(bld.env['SYSCONFDIR']),
             'LIBS'           : 'build/libs',
             'VERSION'        : bld.env['VERSION'],
-            'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
+            'EXECUTABLE'     : 'build/gtk2_ardour/ardour'
     }
 
     def set_subst_dict(obj, dict):
@@ -641,7 +650,7 @@ def build(bld):
     obj.install_path = None
     set_subst_dict(obj, light_rc_subst_dict)
 
-    obj              = bld(rule = autowaf.copyfile) 
+    obj              = bld(rule = copyfile) 
     obj.source       = [ 'ardour3_widget_list.rc' ]
     obj.target       = 'ardour3_widgets.rc'
     obj.install_path = None
diff --git a/tools/windows_packaging/win32-env.sh b/tools/windows_packaging/win32-env.sh
index 6a871a5e40..19ab2870c6 100755
--- a/tools/windows_packaging/win32-env.sh
+++ b/tools/windows_packaging/win32-env.sh
@@ -7,8 +7,8 @@ BASE=$(dirname $BASE) # up one more
 
 HOST=x86_64-w64-mingw32
 MINGW_ROOT=/mingw
-GTK=$HOME/gtk/inst
-A3=$HOME/A3/inst
+GTK=$WINGTK/inst
+A3=$WINA3/inst
 
 export PKG_CONFIG_PREFIX=$MINGW_ROOT
 export PKG_CONFIG_LIBDIR=$MINGW_ROOT/lib/pkgconfig
diff --git a/wscript b/wscript
index 8d874b9b47..57c49215e3 100755
--- a/wscript
+++ b/wscript
@@ -44,7 +44,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
 # because if it is, it breaks waf somehow.
 #
 VERSION = V.encode ('ascii', 'ignore')
-APPNAME = 'Ardour' + MAJOR
+APPNAME = 'Tracks'
 
 # Mandatory variables
 top = '.'