diff --git a/ChangeLog b/ChangeLog
index 09e352f9c0..241537bb95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* tools/Makefile.am:
 	  use AM_CFLAGS since all the CFLAGS are the same
+	  use AM_LDFAGS
 
 2004-02-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9dae89f9f6..eb32b3a51f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,25 +45,13 @@ SUFFIXES = .1 .1.in
 		$< >$@
 
 AM_CFLAGS = $(GST_CFLAGS)
+AM_LDFLAGS = $(GST_LIBS)
 
-gst_launch_LDADD = $(GST_LIBS) #-lefence
+gst_inspect_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
 
-gst_md5sum_LDADD = $(GST_LIBS) #-lefence
-
-gst_typefind_LDADD = $(GST_LIBS) #-lefence
-
-gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
-
-gst_xmlinspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
+gst_xmlinspect_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
 
 if !GST_DISABLE_REGISTRY
-gst_register_LDADD = $(GST_LIBS)
-
-gst_complete_LDADD = $(GST_LIBS)
-
-gst_compprep_LDADD = $(GST_LIBS)
-
 gst_xmllaunch_SOURCES = gst-launch.c
-gst_xmllaunch_LDADD = $(GST_LIBS)
 endif