diff --git a/platform/msb430/contiki-conf.h b/platform/msb430/contiki-conf.h
index 332dd980b..9f6fe5b5f 100644
--- a/platform/msb430/contiki-conf.h
+++ b/platform/msb430/contiki-conf.h
@@ -56,18 +56,20 @@ typedef int bool;
 #define	TRUE				1
 #define FALSE 				0
 
+#define UIP_CONF_ICMP_DEST_UNREACH	1
+#define UIP_CONF_DHCP_LIGHT
+#define UIP_CONF_LLH_LEN		0
+#define UIP_CONF_BUFFER_SIZE		116
+#define UIP_CONF_RECEIVE_WINDOW		(UIP_CONF_BUFFER_SIZE - 40)
 #define UIP_CONF_MAX_CONNECTIONS	4
 #define UIP_CONF_MAX_LISTENPORTS	8
-#define UIP_CONF_BUFFER_SIZE		140
-/*#define UIP_CONF_RECEIVE_WINDOW	140*/
-
-#define UIP_CONF_LLH_LEN		6
-#define UIP_CONF_RESOLV_ENTRIES		1
-#define UIP_CONF_PINGADDRCONF		1
-#define UIP_CONF_LOGGING		0
-#define UIP_CONF_UDP_CONNS		6
-#define UIP_CONF_FWCACHE_SIZE		1
+#define UIP_CONF_UDP_CONNS		8
+#define UIP_CONF_FWCACHE_SIZE		20
 #define UIP_CONF_BROADCAST		1
+#define UIP_ARCH_IPCHKSUM		1
+#define UIP_CONF_UDP_CHECKSUMS		1
+#define UIP_CONF_PINGADDRCONF		0
+#define UIP_CONF_LOGGING		0
 
 #define LOADER_CONF_ARCH "loader/loader-arch.h"