diff --git a/CHANGELOG b/CHANGELOG
index 520d4eaa..6d378498 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -98,6 +98,12 @@ HISTORY
 
   ++ Bug fixes:
 
+  2007-03-28 Simon Goldschmidt
+  * sockets.c Remove "#include <errno.h>" from sockets.c to avoid multiple
+    definition of macros (in errno.h and lwip/arch.h) if LWIP_PROVIDE_ERRNO is
+    defined. This is the way it should have been already (looking at
+    doc/sys_arch.txt)
+
   2007-03-28 Kieran Mansley
   * opt.h Change default PBUF_POOL_BUFSIZE (again) to accomodate default MSS +
     IP and TCP headers *and* physical link headers
diff --git a/src/api/sockets.c b/src/api/sockets.c
index d482c6e6..e549f029 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -33,7 +33,6 @@
  */
 
 #include <string.h>
-#include <errno.h>
 
 #include "lwip/opt.h"
 #include "lwip/api.h"