diff --git a/tools/ChangeLog b/tools/ChangeLog
index d6edc2494..fa334ad31 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  David Shaw  <dshaw@jabberwocky.com>
+
+	* Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
+	capabilities.
+
 2003-02-22  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Distribute convert-from-106.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bd50d9d56..bc42f45df 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106
 INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
 
 bin_PROGRAMS    = gpgsplit
 noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest