diff --git a/MCServer/hg b/MCServer/hg
new file mode 100644
index 000000000..93593de8d
--- /dev/null
+++ b/MCServer/hg
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# This script runs MCServer under helgrind
+# It expects valgrind to be normally installed and available
+# Note that this is for Linux only and debug-only, since it slows down MCS way too much
+
+valgrind --log-file=helgrind.log --suppressions=hg.supp --gen-suppressions=all --tool=helgrind -v ./MCServer
\ No newline at end of file
diff --git a/MCServer/hg.supp b/MCServer/hg.supp
new file mode 100644
index 000000000..048f1382f
--- /dev/null
+++ b/MCServer/hg.supp
@@ -0,0 +1,22 @@
+# This is a valgrind suppressions file for running helgrind on MCServer
+# Use by adding "--suppressions=hg.supp" to the helgrind commandline
+
+
+
+
+
+
+# This covers GCC bug 40518, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518
+# "Erasing an empty string causes a global value write / race condition warning in helgrind"
+# Original suppression authored by Jonathan Wakely: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518#c20
+# Modified by Mattes to match the mangled function name used on Ubuntu
+
+{
+  libstdcxx_std_string_race_pr40518
+  Helgrind:Race
+  fun:_ZNSs9_M_mutateEjjj
+}
+
+
+
+