diff --git a/ChangeLog b/ChangeLog
index efd71362..a59c9303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
  * src/highlighting.c, data/filetypes.ferite: Added some new keywords.
  * src/sci_cb.c:
    Added auto completion for iferr construct for filetype Ferite.
+ * src/socket.c:
+   Added additional header files for compatibility with FreeBSD.
 
 
 2006-10-08  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/src/socket.c b/src/socket.c
index 2659148f..5df769c9 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -26,6 +26,9 @@
 #ifdef HAVE_SOCKET
 
 #ifndef G_OS_WIN32
+# include <string.h>
+# include <sys/time.h>
+# include <sys/types.h>
 # include <sys/socket.h>
 # include <sys/un.h>
 # include <netinet/in.h>