diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index b2a7b776f0..05effbd137 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* shttpd/compat_rtems.h: Include <arpa/inet.h>.
+	Add config.h support.
+
 2007-06-11	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* shttpd/compat_rtems.h: Define closesocket.
diff --git a/cpukit/shttpd/compat_rtems.h b/cpukit/shttpd/compat_rtems.h
index c27b10bbd5..1c32fea0d2 100644
--- a/cpukit/shttpd/compat_rtems.h
+++ b/cpukit/shttpd/compat_rtems.h
@@ -5,12 +5,17 @@
 #ifndef _rtems_rtems_webserver_h
 #define _rtems_rtems_webserver_h
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "shttpd.h"
 
 #include <rtems.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <dirent.h>
+#include <arpa/inet.h>
 
 /* RTEMS is an Real Time Embedded operating system, for operation in hardware.
   It does not have SSL or CGI support, as it does not have dynamic library