diff --git a/ChangeLog b/ChangeLog
index 856467e5f9..d27e8a6fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-14  Thomas Vander Stichele <thomas at apestaart dot org>
+
+        * put GST_CACHE_DIR in config.h, as ordered by iain
+
 2003-11-14  Thomas Vander Stichele <thomas at apestaart dot org>
 
         * Slap walters back into place.
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 02367af6bc..64e0e5a62a 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -135,7 +135,6 @@ BUILT_SOURCES = gstversion.h gstconfig.h gstmarshal.h gstmarshal.c gstenumtypes.
 libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = -D_GNU_SOURCE \
 	$(GST_CFLAGS) \
 	-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" \
 	-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" 
 libgstreamer_@GST_MAJORMINOR@_la_LIBADD = $(LIBGST_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1fcd16d05a..56f2d4fa7c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,41 +45,32 @@ SUFFIXES = .1 .1.in
 		$< >$@
 
 gst_launch_LDADD = $(GST_LIBS) #-lefence
-gst_launch_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_launch_CFLAGS = $(GST_CFLAGS)
 
 gst_md5sum_LDADD = $(GST_LIBS) #-lefence
-gst_md5sum_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_md5sum_CFLAGS = $(GST_CFLAGS)
 
 gst_typefind_LDADD = $(GST_LIBS) #-lefence
-gst_typefind_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_typefind_CFLAGS = $(GST_CFLAGS)
 
 gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
-gst_inspect_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_inspect_CFLAGS = $(GST_CFLAGS)
 
 gst_xmlinspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
-gst_xmlinspect_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_xmlinspect_CFLAGS = $(GST_CFLAGS)
 
 if !GST_DISABLE_REGISTRY
 gst_register_LDADD = $(GST_LIBS)
-gst_register_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_register_CFLAGS = $(GST_CFLAGS)
 
 gst_complete_LDADD = $(GST_LIBS)
-gst_complete_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_complete_CFLAGS = $(GST_CFLAGS)
 
 gst_compprep_LDADD = $(GST_LIBS)
-gst_compprep_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_compprep_CFLAGS = $(GST_CFLAGS)
 
 gst_xmllaunch_SOURCES = gst-launch.c
 gst_xmllaunch_LDADD = $(GST_LIBS)
-gst_xmllaunch_CFLAGS = $(GST_CFLAGS) \
-	-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\" 
+gst_xmllaunch_CFLAGS = $(GST_CFLAGS)
 endif