diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am
index b40f9cf95f..a4cc747220 100644
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
   gnucash-build-env.in \
   gnucash-make-guids \
   gnucash-run-script \
+  gnucash-valgrind \
   guile.in 
 
 noinst_DATA = gnucash-build-env
diff --git a/src/bin/overrides/gnucash-valgrind b/src/bin/overrides/gnucash-valgrind
new file mode 100755
index 0000000000..2e09be9ce7
--- /dev/null
+++ b/src/bin/overrides/gnucash-valgrind
@@ -0,0 +1,16 @@
+#!/bin/sh
+exec ./src/bin/overrides/gnucash-build-env valgrind -v --suppressions=./src/valgrind-gnucash.supp guile -e main -s "$0" "$@"
+!#
+
+(use-modules (gnucash main))
+
+(define (main args)
+  ;; UGLY HACK -- FIXME -- code should be rewritten to not need this.
+  ;; In particular, we should be using gnc_scm_lookup where we're using
+  ;; gh_lookup or gh_eval_str now.
+  (set-current-module (resolve-module '(gnucash main)))
+  (gnc:main))
+
+;; Local Variables:
+;; mode: scheme
+;; End: