diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 7040d4bf49..11617af1f4 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,5 +1,5 @@
 #!/bin/sh
-. `dirname "$0"`/ardev_common.sh
+. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_INSIDE_GDB=1
 exec gdb --args $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardbg-waf b/gtk2_ardour/ardbg-scons
similarity index 65%
rename from gtk2_ardour/ardbg-waf
rename to gtk2_ardour/ardbg-scons
index 11617af1f4..7040d4bf49 100755
--- a/gtk2_ardour/ardbg-waf
+++ b/gtk2_ardour/ardbg-scons
@@ -1,5 +1,5 @@
 #!/bin/sh
-. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
+. `dirname "$0"`/ardev_common.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_INSIDE_GDB=1
 exec gdb --args $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 3141db47a1..8f0af37d15 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,4 +1,4 @@
 #!/bin/sh
-. `dirname "$0"`/ardev_common.sh
+. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 exec $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardev-waf b/gtk2_ardour/ardev-scons
similarity index 56%
rename from gtk2_ardour/ardev-waf
rename to gtk2_ardour/ardev-scons
index 8f0af37d15..3141db47a1 100755
--- a/gtk2_ardour/ardev-waf
+++ b/gtk2_ardour/ardev-scons
@@ -1,4 +1,4 @@
 #!/bin/sh
-. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
+. `dirname "$0"`/ardev_common.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 exec $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/arprof b/gtk2_ardour/arprof-scons
similarity index 100%
rename from gtk2_ardour/arprof
rename to gtk2_ardour/arprof-scons
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
old mode 100755
new mode 100644
index b9c0298c8f..f8c8a336a7
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -1,4 +1,5 @@
 #!/bin/sh
-. `dirname "$0"`/ardev_common.sh
+. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
+LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind  --num-callers=50 --tool=memcheck $TOP/$EXECUTABLE --novst "$@"
diff --git a/gtk2_ardour/arval-waf b/gtk2_ardour/arval-scons
old mode 100644
new mode 100755
similarity index 53%
rename from gtk2_ardour/arval-waf
rename to gtk2_ardour/arval-scons
index f8c8a336a7..b9c0298c8f
--- a/gtk2_ardour/arval-waf
+++ b/gtk2_ardour/arval-scons
@@ -1,5 +1,4 @@
 #!/bin/sh
-. `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh
-LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+. `dirname "$0"`/ardev_common.sh
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind  --num-callers=50 --tool=memcheck $TOP/$EXECUTABLE --novst "$@"