diff --git a/MCServer/.gitignore b/MCServer/.gitignore
index ff0517cfa..d9d869986 100644
--- a/MCServer/.gitignore
+++ b/MCServer/.gitignore
@@ -16,5 +16,6 @@ memdump*
 *.grab
 ProtectionAreas.sqlite
 helgrind.log
+valgrind.log
 motd.txt
 *.deuser
diff --git a/MCServer/vg b/MCServer/vg
new file mode 100644
index 000000000..fcc8270d0
--- /dev/null
+++ b/MCServer/vg
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# This script runs MCServer under valgrind
+# 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=valgrind.log --suppressions=vg.supp --tool=memcheck --leak-check=full --leak-resolution=high --show-reachable=yes --track-origins=yes -v ./MCServer
diff --git a/MCServer/vg.supp b/MCServer/vg.supp
new file mode 100644
index 000000000..e69de29bb