diff --git a/ChangeLog b/ChangeLog
index be60a0b465..175034c645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-05  Andrew Turner <zxombie@hotpop.com>
+
+	* gst/tcp/gsttcp.c: portability (Solaris 10/FreeBSD)
+	* gst/tcp/gsttcpclientsrc.h: idem
+	  - define MSG_NOSIGNAL if not done
+	  - include unistd.h for off_t
+          (fixes #143749)
+
 2004-06-05  Benjamin Otte  <otte@gnome.org>
 
 	* configure.ac:
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
index 68bbddd9a1..343b57de0c 100644
--- a/gst/tcp/gsttcp.c
+++ b/gst/tcp/gsttcp.c
@@ -36,6 +36,10 @@
 #include <gst/gst-i18n-plugin.h>
 #include <gst/dataprotocol/dataprotocol.h>
 
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
 /* resolve host to IP address, throwing errors if it fails */
 /* host can already be an IP address */
 /* returns a newly allocated gchar * with the dotted ip address */
diff --git a/gst/tcp/gsttcpclientsrc.h b/gst/tcp/gsttcpclientsrc.h
index 7dd5d4e02f..414082b03e 100644
--- a/gst/tcp/gsttcpclientsrc.h
+++ b/gst/tcp/gsttcpclientsrc.h
@@ -30,6 +30,7 @@ extern "C" {
 
 #include <netdb.h>                        /* sockaddr_in */
 #include <netinet/in.h>			  /* sockaddr_in */
+#include <unistd.h>
 #include "gsttcp.h"
 
 #define GST_TYPE_TCPCLIENTSRC \