diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
index e563d7800c..c67bb0ac03 100755
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -1,5 +1,14 @@
 #!/bin/sh
+VALGRIND_OPTIONS="$VALGRIND_OPTIONS --num-callers=50"
+VALGRIND_OPTIONS="$VALGRIND_OPTIONS --error-limit=no"
+VALGRIND_OPTIONS="$VALGRIND_OPTIONS --leak-check=full --leak-resolution=high"
+#VALGRIND_OPTIONS="$VALGRIND_OPTIONS --log-file=/tmp/ardour-%p.log"
+#VALGRIND_OPTIONS="$VALGRIND_OPTIONS --gen-suppressions=all"
+
 . `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh
 LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
-exec valgrind  --error-limit=no --num-callers=50 --tool=memcheck $TOP/$EXECUTABLE --novst "$@"
+exec valgrind --tool=memcheck \
+	$VALGRIND_OPTIONS \
+	--suppressions=`dirname "$0"`/../tools/valgrind.supp \
+	$TOP/$EXECUTABLE --novst "$@"
diff --git a/tools/valgrind.supp b/tools/valgrind.supp
new file mode 100644
index 0000000000..1d1e1bd1e4
--- /dev/null
+++ b/tools/valgrind.supp
@@ -0,0 +1,137 @@
+{
+  name
+  Memcheck:Leak
+  fun:*alloc
+  obj:/usr/lib/*.so.*
+}
+{
+  name
+  Memcheck:Leak
+  fun:*alloc
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Cond
+  fun:*
+  obj:/usr/lib/*.so.*
+}
+{
+  name
+  Memcheck:Cond
+  fun:*
+  obj:/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Cond
+  fun:*
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Cond
+  obj:/usr/lib/*-linux-gnu/*.so.*
+  obj:*
+}
+{
+  name
+  Memcheck:Value4
+  fun:*
+  obj:/lib/*.so.*
+}
+{
+  name
+  Memcheck:Value4
+  fun:*
+  obj:/usr/lib/*.so.*
+}
+{
+  name
+  Memcheck:Value4
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Value4
+  fun:*
+  obj:/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Value8
+  fun:*
+  obj:/lib/*.so.*
+}
+{
+  name
+  Memcheck:Value8
+  fun:*
+  obj:/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Value8
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Addr4
+  obj:/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Addr4
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Addr8
+  obj:/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Addr8
+  obj:/usr/lib/*-linux-gnu/*.so.*
+}
+{
+  name
+  Memcheck:Param
+  write(buf)
+  obj:/lib/*-linux-gnu/i686/cmov/libpthread-2.13.so
+  obj:/usr/lib/*-linux-gnu/libjack.so.0.1.0
+  fun:*
+}
+{
+  <name>
+  Memcheck:Cond
+  fun:apply_queued_setting
+  fun:gtk_rc_parse_any
+  fun:gtk_rc_context_parse_one_file
+  fun:gtk_rc_context_parse_file
+  fun:gtk_rc_parse
+}
+{
+  <known gtk leaks>
+  Memcheck:Leak
+  fun:malloc
+  fun:standard_malloc
+  fun:g_malloc
+  fun:g_strdup
+  fun:gtk_label_set_text
+}
+{
+  <gdk pixbuf sux>
+  Memcheck:Leak
+  fun:malloc
+  fun:standard_malloc
+  fun:g_try_malloc
+  fun:gdk_pixbuf_new
+}
+{
+  <ladspa free>
+  Memcheck:Leak
+  fun:*
+  fun:ladspa_descriptor
+  fun:*
+}