diff --git a/tests/ChangeLog b/tests/ChangeLog
index c36dc4c..f3ec6cf 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,7 +1,8 @@
 2004-05-22 Paul Jakma <paul@dishone.st>
 
 	* heavy-thread.c: Andrew Schorr's adaptation of heavy.c to use a
-	  background thread to avoid responsivity problems.
+	  background thread to avoid responsiveness problems.
+	* Makefile.am: Build heavythread
 
 2004-05-21 Paul Jakma <paul@dishone.st>
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c3fac7c..e5d8739 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,15 @@
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
-noinst_PROGRAMS = testsig testbuffer testmemory
+noinst_PROGRAMS = testsig testbuffer testmemory heavy heavythread
 testsig_SOURCES = test-sig.c
 testbuffer_SOURCES = test-buffer.c
 testmemory_SOURCES = test-memory.c
+heavy_SOURCES = heavy.c
+heavythread_SOURCES = heavy-thread.c
 
 testsig_LDADD = ../lib/libzebra.la @LIBCAP@
 testbuffer_LDADD = ../lib/libzebra.la @LIBCAP@
 testmemory_LDADD = ../lib/libzebra.la @LIBCAP@
-
+heavy_LDADD = ../lib/libzebra.la @LIBCAP@
+heavythread_LDADD = ../lib/libzebra.la @LIBCAP@ -lm