diff --git a/platform/cc2420dbk/contiki-conf.h b/platform/cc2420dbk/contiki-conf.h
index 6156d5da1..5f5e9548f 100644
--- a/platform/cc2420dbk/contiki-conf.h
+++ b/platform/cc2420dbk/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.1 2007/02/02 14:07:34 bg- Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.2 2007/04/11 15:24:39 bg- Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -11,8 +11,7 @@
 #define CCIF
 #define CLIF
 
-/* This is still experimental. /bg */
-#define UAODV_BAD_ROUTE
+#define AODV_NUM_RT_ENTRIES 32
 
 /* Helper prototypes that should go somewhere. */
 void *sbrk(int);
@@ -56,8 +55,8 @@ unsigned long clock_seconds(void);
 #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_UDP_CONNS       6
-#define UIP_CONF_FWCACHE_SIZE    5
+#define UIP_CONF_UDP_CONNS       12
+#define UIP_CONF_FWCACHE_SIZE    30
 #define UIP_CONF_BROADCAST       1
 //#define UIP_ARCH_IPCHKSUM        1
 #define UIP_CONF_UDP_CHECKSUMS   1