diff --git a/Makefile.am b/Makefile.am
index 496eb48d2..a9694a335 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,17 +9,18 @@ TOOLS =		memcheck \
 		massif \
 		lackey \
 		none \
+		helgrind \
 		exp-omega
 
-# Temporary: we want to compile Helgrind, but not regtest it.
 # Put docs last because building the HTML is slow and we want to get
 # everything else working before we try it.
-SUBDIRS = include coregrind . tests perf auxprogs $(TOOLS) helgrind docs
+SUBDIRS = include coregrind . tests perf auxprogs $(TOOLS) docs
 DIST_SUBDIRS  = $(SUBDIRS)
 
 SUPP_FILES = \
 	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
-	glibc-2.6.supp aix5libc.supp xfree-3.supp xfree-4.supp
+	glibc-2.6.supp aix5libc.supp xfree-3.supp xfree-4.supp \
+	glibc-2.X-helgrind.supp
 
 dist_val_DATA = $(SUPP_FILES) default.supp
 
diff --git a/configure.in b/configure.in
index f5ed70bb9..cc7190e1f 100644
--- a/configure.in
+++ b/configure.in
@@ -473,30 +473,30 @@ case "${libc}" in
      2.2)
 	AC_MSG_RESULT(2.2 family)
 	AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x])
-	DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.2.supp glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
 	;;
 
      2.3)
 	AC_MSG_RESULT(2.3 family)
 	AC_DEFINE([GLIBC_2_3], 1, [Define to 1 if you're using glibc 2.3.x])
-	DEFAULT_SUPP="glibc-2.3.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.3.supp glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
 	;;
 
      2.4)
 	AC_MSG_RESULT(2.4 family)
 	AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x])
-	DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.4.supp glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
 	;;
 
      2.5)
 	AC_MSG_RESULT(2.5 family)
 	AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
-	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.5.supp glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
 	;;
      2.6)
 	AC_MSG_RESULT(2.6 family)
 	AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
-	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.6.supp glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
 	;;
      aix5)
 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
diff --git a/docs/xml/manual.xml b/docs/xml/manual.xml
index 7cb29e522..2b61c6e44 100644
--- a/docs/xml/manual.xml
+++ b/docs/xml/manual.xml
@@ -28,12 +28,10 @@
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../callgrind/docs/cl-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="../../massif/docs/ms-manual.xml" parse="xml"  
-      xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!--
   <xi:include href="../../helgrind/docs/hg-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
--->
+  <xi:include href="../../massif/docs/ms-manual.xml" parse="xml"  
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../none/docs/nl-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../lackey/docs/lk-manual.xml" parse="xml"  
diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index 440662c45..aed088986 100644
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
 	shrld.stderr.exp shrld.stdout.exp shrld.vgtest \
 	slahf-amd64.stderr.exp slahf-amd64.stdout.exp \
-	slahf-amd64.stderr.vgtest
+	slahf-amd64.vgtest
 
 
 check_PROGRAMS = \