diff --git a/CHANGELOG b/CHANGELOG
index 07e18937..34078239 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -66,6 +66,10 @@ HISTORY
   * api_lib.c: Use memcpy in netbuf_copy_partial.
 
   ++ Bug fixes:
+  2007-03-21 Kieran Mansley
+  * opt.h Change default PBUF_POOL_BUFSIZE to accomodate default MSS +
+    IP and TCP headers
+
   2007-03-21 Kieran Mansley
   * Fix all uses of pbuf_header to check the return value.  In some
     cases just assert if it fails as I'm not sure how to fix them, but
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 375f287f..98c96cb7 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -153,7 +153,8 @@ a lot of data that needs to be copied, this should be set high. */
 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
 
 #ifndef PBUF_POOL_BUFSIZE
-#define PBUF_POOL_BUFSIZE               128
+/* TCP_MSS + 40 for IP and TCP headers */
+#define PBUF_POOL_BUFSIZE               (128+40) 
 #endif
 
 /* PBUF_LINK_HLEN: the number of bytes that should be allocated for a