diff --git a/.gitignore b/.gitignore
index b5723b0fa4..cc0ff94080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,9 @@ libs/glibmm2/autom4te.cache
 libs/sigc++2/autom4te.cache
 .sconf_temp
 libs/taglib/headers/taglib
+.lock-wscript
+.waf-*
+build
+*.swp
+tags
+
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 71ec752e3f..7040d4bf49 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,5 +1,5 @@
 #!/bin/sh
-. ./ardev_common.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/ardbg-waf b/gtk2_ardour/ardbg-waf
index e515e7bb8d..11617af1f4 100755
--- a/gtk2_ardour/ardbg-waf
+++ b/gtk2_ardour/ardbg-waf
@@ -1,5 +1,5 @@
 #!/bin/sh
-. ../build/default/gtk2_ardour/ardev_common_waf.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/ardev b/gtk2_ardour/ardev
index 81af10126f..3141db47a1 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,4 +1,4 @@
 #!/bin/sh
-. ./ardev_common.sh
+. `dirname "$0"`/ardev_common.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 exec $TOP/$EXECUTABLE "$@"
diff --git a/gtk2_ardour/ardev-waf b/gtk2_ardour/ardev-waf
index 2e43f0e7f2..8f0af37d15 100755
--- a/gtk2_ardour/ardev-waf
+++ b/gtk2_ardour/ardev-waf
@@ -1,4 +1,4 @@
 #!/bin/sh
-. ../build/default/gtk2_ardour/ardev_common_waf.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_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 7a3ad5d46a..09ddb34a24 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -1,4 +1,4 @@
-TOP=..
+TOP=`dirname "$0"`/..
 
 #export G_DEBUG=fatal_criticals