diff --git a/ChangeLog b/ChangeLog
index 42b3013a05..f784aba700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-16  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+	* gst/tcp/gsttcp.c: (gst_tcp_socket_read):
+	Return GST_FLOW_UNEXPECTED when we have an eos on the socket so
+	basesrc can do its job correctly.
+
 2006-05-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/alsa/Makefile.am:
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
index a1121480f5..76c86c316e 100644
--- a/gst/tcp/gsttcp.c
+++ b/gst/tcp/gsttcp.c
@@ -200,7 +200,7 @@ ioctl_error:
 got_eos:
   {
     GST_DEBUG_OBJECT (this, "Got EOS on socket stream");
-    return GST_FLOW_WRONG_STATE;
+    return GST_FLOW_UNEXPECTED;
   }
 read_error:
   {