diff --git a/src/api/api_lib.c b/src/api/api_lib.c
index 8c519090..93c0e453 100644
--- a/src/api/api_lib.c
+++ b/src/api/api_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/api/api_msg.c b/src/api/api_msg.c
index 3fb2dbbb..a05bb858 100644
--- a/src/api/api_msg.c
+++ b/src/api/api_msg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/api/err.c b/src/api/err.c
index ea8b75a0..b582d88a 100644
--- a/src/api/err.c
+++ b/src/api/err.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index e27dae0c..bdd35932 100644
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/inet.c b/src/core/inet.c
index a0243987..818f7ba9 100644
--- a/src/core/inet.c
+++ b/src/core/inet.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/inet6.c b/src/core/inet6.c
index 2a1931fe..c04915b7 100644
--- a/src/core/inet6.c
+++ b/src/core/inet6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/ipv4/icmp.c b/src/core/ipv4/icmp.c
index 078100be..fbf5e7e5 100644
--- a/src/core/ipv4/icmp.c
+++ b/src/core/ipv4/icmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/ipv4/ip.c b/src/core/ipv4/ip.c
index 25862519..b7ed02e3 100644
--- a/src/core/ipv4/ip.c
+++ b/src/core/ipv4/ip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/ipv4/ip_addr.c b/src/core/ipv4/ip_addr.c
index 83da77f7..d01420be 100644
--- a/src/core/ipv4/ip_addr.c
+++ b/src/core/ipv4/ip_addr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/ipv4/ip_frag.c b/src/core/ipv4/ip_frag.c
index 141293ff..ab5e6503 100644
--- a/src/core/ipv4/ip_frag.c
+++ b/src/core/ipv4/ip_frag.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/ipv6/icmp6.c b/src/core/ipv6/icmp6.c
index 832e0417..a162758a 100644
--- a/src/core/ipv6/icmp6.c
+++ b/src/core/ipv6/icmp6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/ipv6/ip6.c b/src/core/ipv6/ip6.c
index 00496f60..403e4de0 100644
--- a/src/core/ipv6/ip6.c
+++ b/src/core/ipv6/ip6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/ipv6/ip6_addr.c b/src/core/ipv6/ip6_addr.c
index 1f6700d3..3e11e07e 100644
--- a/src/core/ipv6/ip6_addr.c
+++ b/src/core/ipv6/ip6_addr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/mem.c b/src/core/mem.c
index 43f48853..c5214800 100644
--- a/src/core/mem.c
+++ b/src/core/mem.c
@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -54,6 +54,8 @@ struct mem {
   u16_t used;
 #elif MEM_ALIGNMENT == 4
   u32_t used;
+#elif MEM_ALIGNMENT == 8
+  u64_t used;
 #else
 #error "unhandled MEM_ALIGNMENT size"
 #endif /* MEM_ALIGNMENT */
@@ -292,7 +294,7 @@ mem_malloc(mem_size_t size)
       }
       sys_sem_signal(mem_sem);
       LWIP_ASSERT("mem_malloc: allocated memory not above ram_end.",
-       (u32_t)mem + SIZEOF_STRUCT_MEM + size <= (u32_t)ram_end);
+       (mem_ptr_t)mem + SIZEOF_STRUCT_MEM + size <= (mem_ptr_t)ram_end);
       LWIP_ASSERT("mem_malloc: allocated memory properly aligned.",
        (unsigned long)((u8_t *)mem + SIZEOF_STRUCT_MEM) % MEM_ALIGNMENT == 0);
       return (u8_t *)mem + SIZEOF_STRUCT_MEM;
diff --git a/src/core/pbuf.c b/src/core/pbuf.c
index f1718257..20843080 100644
--- a/src/core/pbuf.c
+++ b/src/core/pbuf.c
@@ -28,7 +28,7 @@
  */
 
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/raw.c b/src/core/raw.c
index 7e3aa41d..c4c69e54 100644
--- a/src/core/raw.c
+++ b/src/core/raw.c
@@ -4,7 +4,7 @@
  *
  */
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/stats.c b/src/core/stats.c
index 85ebda4d..85a55b9e 100644
--- a/src/core/stats.c
+++ b/src/core/stats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/core/sys.c b/src/core/sys.c
index cc4aaf07..657d72a8 100644
--- a/src/core/sys.c
+++ b/src/core/sys.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
index fbfc831b..70838947 100644
--- a/src/core/tcp_out.c
+++ b/src/core/tcp_out.c
@@ -4,7 +4,7 @@
  * Transmission Control Protocol, outgoing traffic
  */
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/core/udp.c b/src/core/udp.c
index 4cb25059..258c853e 100644
--- a/src/core/udp.c
+++ b/src/core/udp.c
@@ -4,7 +4,7 @@
  *
  */
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/include/ipv4/lwip/icmp.h b/src/include/ipv4/lwip/icmp.h
index f9445c0b..351e4565 100644
--- a/src/include/ipv4/lwip/icmp.h
+++ b/src/include/ipv4/lwip/icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv4/lwip/inet.h b/src/include/ipv4/lwip/inet.h
index 80524a72..01bd8a89 100644
--- a/src/include/ipv4/lwip/inet.h
+++ b/src/include/ipv4/lwip/inet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv4/lwip/ip.h b/src/include/ipv4/lwip/ip.h
index 57f96a28..c631f324 100644
--- a/src/include/ipv4/lwip/ip.h
+++ b/src/include/ipv4/lwip/ip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv4/lwip/ip_addr.h b/src/include/ipv4/lwip/ip_addr.h
index ee2ec2d9..6b142eec 100644
--- a/src/include/ipv4/lwip/ip_addr.h
+++ b/src/include/ipv4/lwip/ip_addr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/include/ipv4/lwip/ip_frag.h b/src/include/ipv4/lwip/ip_frag.h
index 31cda648..654b4d7f 100644
--- a/src/include/ipv4/lwip/ip_frag.h
+++ b/src/include/ipv4/lwip/ip_frag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv6/lwip/icmp.h b/src/include/ipv6/lwip/icmp.h
index dc500cd9..2b6adb12 100644
--- a/src/include/ipv6/lwip/icmp.h
+++ b/src/include/ipv6/lwip/icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv6/lwip/inet.h b/src/include/ipv6/lwip/inet.h
index 38489a5f..3cdd7407 100644
--- a/src/include/ipv6/lwip/inet.h
+++ b/src/include/ipv6/lwip/inet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv6/lwip/ip.h b/src/include/ipv6/lwip/ip.h
index 44e84ed3..432ca36e 100644
--- a/src/include/ipv6/lwip/ip.h
+++ b/src/include/ipv6/lwip/ip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/ipv6/lwip/ip_addr.h b/src/include/ipv6/lwip/ip_addr.h
index d96bcb18..40c698ec 100644
--- a/src/include/ipv6/lwip/ip_addr.h
+++ b/src/include/ipv6/lwip/ip_addr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h
index 6680d8d8..7f0ad596 100644
--- a/src/include/lwip/api.h
+++ b/src/include/lwip/api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/api_msg.h b/src/include/lwip/api_msg.h
index 60bd3584..1957abc5 100644
--- a/src/include/lwip/api_msg.h
+++ b/src/include/lwip/api_msg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h
index a9c34127..e0d622a4 100644
--- a/src/include/lwip/arch.h
+++ b/src/include/lwip/arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/debug.h b/src/include/lwip/debug.h
index cc9b0c55..147e87d0 100644
--- a/src/include/lwip/debug.h
+++ b/src/include/lwip/debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/def.h b/src/include/lwip/def.h
index 1b5b7456..eba9b877 100644
--- a/src/include/lwip/def.h
+++ b/src/include/lwip/def.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/err.h b/src/include/lwip/err.h
index d68479f8..c92cb26d 100644
--- a/src/include/lwip/err.h
+++ b/src/include/lwip/err.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -59,6 +59,7 @@ typedef s8_t err_t;
 #define ERR_USE  -10     /* Address in use.          */
 
 #define ERR_IF   -11     /* Low-level netif error    */
+#define ERR_ISCONN -12   /* Already connected.       */
 
 
 #ifdef LWIP_DEBUG
diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index f9607dcf..ee6fea7d 100644
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h
index 2daf5229..1cd46fa3 100644
--- a/src/include/lwip/memp.h
+++ b/src/include/lwip/memp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index 1c668480..3d571d7f 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -40,7 +40,9 @@
 
 #include "lwip/inet.h"
 #include "lwip/pbuf.h"
-#include "lwip/dhcp.h"
+#if LWIP_DHCP
+#  include "lwip/dhcp.h"
+#endif
 
 /** must be the maximum of all used hardware address lengths
     across all types of interfaces in use */
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 222d8a92..bc3db472 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -67,6 +67,10 @@ a lot of data that needs to be copied, this should be set high. */
 #define MEM_SIZE                        1600
 #endif
 
+#ifndef MEMP_SANITY_CHECK
+#define MEMP_SANITY_CHECK		0
+#endif
+
 /* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
    sends a lot of data out of ROM (or other static memory), this
    should be set high. */
@@ -218,6 +222,10 @@ a lot of data that needs to be copied, this should be set high. */
 
 /* ---------- RAW options ---------- */
 
+#ifndef LWIP_RAW
+#define LWIP_RAW                        1
+#endif
+
 #ifndef RAW_TTL
 #define RAW_TTL                        255
 #endif
@@ -348,6 +356,10 @@ a lot of data that needs to be copied, this should be set high. */
 
 #if LWIP_STATS
 
+#ifndef LWIP_STATS_DISPLAY
+#define LWIP_STATS_DISPLAY 0
+#endif
+
 #ifndef LINK_STATS
 #define LINK_STATS	1
 #endif
@@ -405,6 +417,7 @@ a lot of data that needs to be copied, this should be set high. */
 #define PBUF_STATS	0
 #define SYS_STATS	0
 #define RAW_STATS	0
+#define LWIP_STATS_DISPLAY	0
 
 #endif /* LWIP_STATS */
 
diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h
index 36c54319..8ef96824 100644
--- a/src/include/lwip/pbuf.h
+++ b/src/include/lwip/pbuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/raw.h b/src/include/lwip/raw.h
index acad136b..4ece7901 100644
--- a/src/include/lwip/raw.h
+++ b/src/include/lwip/raw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/include/lwip/sio.h b/src/include/lwip/sio.h
index 88366862..8a37aa35 100644
--- a/src/include/lwip/sio.h
+++ b/src/include/lwip/sio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index 2bf7740e..e2d23db1 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h
index ac06a6d3..105def97 100644
--- a/src/include/lwip/stats.h
+++ b/src/include/lwip/stats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/sys.h b/src/include/lwip/sys.h
index 6eda955a..68926e95 100644
--- a/src/include/lwip/sys.h
+++ b/src/include/lwip/sys.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h
index 1231f6e7..78daae5d 100644
--- a/src/include/lwip/tcp.h
+++ b/src/include/lwip/tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/tcpip.h b/src/include/lwip/tcpip.h
index 7ec59642..316ae4fc 100644
--- a/src/include/lwip/tcpip.h
+++ b/src/include/lwip/tcpip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/lwip/udp.h b/src/include/lwip/udp.h
index 00ac4f0b..8a8563c2 100644
--- a/src/include/lwip/udp.h
+++ b/src/include/lwip/udp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/netif/etharp.h b/src/include/netif/etharp.h
index 397af4c9..c8feecd8 100644
--- a/src/include/netif/etharp.h
+++ b/src/include/netif/etharp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/include/netif/loopif.h b/src/include/netif/loopif.h
index 086f8121..97b3c676 100644
--- a/src/include/netif/loopif.h
+++ b/src/include/netif/loopif.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/netif/etharp.c b/src/netif/etharp.c
index ebbabfbc..c7e3f98d 100644
--- a/src/netif/etharp.c
+++ b/src/netif/etharp.c
@@ -11,7 +11,7 @@
  */
 
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/netif/ethernetif.c b/src/netif/ethernetif.c
index 557c00c6..f024661d 100644
--- a/src/netif/ethernetif.c
+++ b/src/netif/ethernetif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/netif/loopif.c b/src/netif/loopif.c
index 9e7c03a0..f5bcc07c 100644
--- a/src/netif/loopif.c
+++ b/src/netif/loopif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
diff --git a/src/netif/slipif.c b/src/netif/slipif.c
index 97618517..b349d82c 100644
--- a/src/netif/slipif.c
+++ b/src/netif/slipif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without