diff --git a/ChangeLog b/ChangeLog
index 474f13683e..4dd6070bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-19  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* ext/esd/Makefile.am:
+	  Disable tcp elements and esdmon (they don't compile).
+
 2005-05-19  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* Makefile.am:
diff --git a/configure.ac b/configure.ac
index 4d38af192a..6ff7fcb79d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,6 @@ GST_PLUGINS_ALL="\
 		rtp	\
 		rtsp	\
 		smpte	\
-		tcp	\
 		udp"
 
 dnl see if we can build C++ plug-ins
diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am
index 22cbff45a0..14eb41d20c 100644
--- a/ext/esd/Makefile.am
+++ b/ext/esd/Makefile.am
@@ -1,7 +1,8 @@
 
 plugin_LTLIBRARIES = libgstesd.la
 
-libgstesd_la_SOURCES = esdsink.c esdmon.c gstesd.c
+libgstesd_la_SOURCES = esdsink.c gstesd.c
+#esdmon.c
 libgstesd_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS)
 libgstesd_la_LIBADD = $(ESD_LIBS) $(GST_PLUGINS_LIBS_LIBS) -lgstaudio-@GST_MAJORMINOR@
 libgstesd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)