diff --git a/ChangeLog b/ChangeLog
index dd84a41352..88ccdbd9cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-03  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+	* gst/tcp/gsttcp.c: (gst_tcp_socket_write):
+	  don't get a signal for EPIPE on socket writes
+	  (somebody check if this works on other platforms)
+
 2004-06-02  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/alsa/gstalsaclock.c: (gst_alsa_clock_get_type):
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
index 307ba9d85f..68bbddd9a1 100644
--- a/gst/tcp/gsttcp.c
+++ b/gst/tcp/gsttcp.c
@@ -84,8 +84,8 @@ gst_tcp_socket_write (int socket, const void *buf, size_t count)
   size_t bytes_written = 0;
 
   while (bytes_written < count) {
-    ssize_t wrote = write (socket, buf + bytes_written,
-        count - bytes_written);
+    ssize_t wrote = send (socket, buf + bytes_written,
+        count - bytes_written, MSG_NOSIGNAL);
 
     if (wrote <= 0) {
       return bytes_written;