diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index dde203219e..115db85f59 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,4 +1,4 @@
 #!/bin/sh
 dir=`dirname "$0"`
 source $dir/ardev_common.sh
-exec gdb $dir/ardour.bin $*
+exec gdb gtk2_ardour/ardour.bin $*
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 26722c7224..751557d634 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,4 +1,3 @@
 #!/bin/sh
-dir=`dirname "$0"`
-source ardev_common.sh
-exec $dir/ardour.bin --novst $*
+source `dirname "$0"`/ardev_common.sh
+exec gtk2_ardour/ardour.bin --novst "$*"
diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh
index d47dfc825b..df4bb025c0 100755
--- a/gtk2_ardour/ardev_common.sh
+++ b/gtk2_ardour/ardev_common.sh
@@ -1,4 +1,4 @@
-cd $dir/..
+cd `dirname "$0"`/..
 
 #export G_DEBUG=fatal_criticals