diff --git a/ChangeLog b/ChangeLog
index 50c03353ce..6459c18676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/Makefile.am:
+	  don't try and build net if we don't even have <sys/socket.h>
+
 2005-11-27  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* check/Makefile.am:
diff --git a/gst/Makefile.am b/gst/Makefile.am
index ccb582e931..b141eade1a 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -57,7 +57,11 @@ endif
 if GST_DISABLE_NET
 SUBDIRS_NET = 
 else
+if HAVE_SYS_SOCKET_H
 SUBDIRS_NET = net
+else
+SUBDIRS_NET = 
+endif
 endif
 
 SUBDIRS = \