diff --git a/ChangeLog b/ChangeLog
index 4f99467925..c8f10b92c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/tcp/Makefile.am:
+	* gst/tcp/gsttcp.c:
+	* gst/tcp/gsttcp.h:
+	* gst/tcp/gsttcpsink.h:
+	* gst/tcp/gsttcpsrc.h:
+          gsttcp -> gsttcpplugin + CVS surgery in preparation for tcp merge
+
 2004-05-19  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/debug/tests.c: (md5_get_value):