diff --git a/src/ChangeLog b/src/ChangeLog
index 43d80e50..992207de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-19  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* host.h: Include Unix-specific includes #ifndef WINDOWS.
+	Patch originally provided by Christian Lackas.
+
 2002-02-11  Christian Lackas  <delta@lackas.net>
 
 	* recur.c: recurive downloading for https fixed.
diff --git a/src/host.h b/src/host.h
index 01a392eb..3ca6af48 100644
--- a/src/host.h
+++ b/src/host.h
@@ -21,8 +21,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HOST_H
 
 #include <netdb.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
+
+#ifdef WINDOWS
+# include <winsock.h>
+#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+#ifndef __BEOS__
+# include <arpa/inet.h>
+#endif
+#endif
 
 #undef INET6