diff --git a/platform/netsim/contiki-conf.h b/platform/netsim/contiki-conf.h
index a7caec235..ca712293b 100644
--- a/platform/netsim/contiki-conf.h
+++ b/platform/netsim/contiki-conf.h
@@ -1,6 +1,8 @@
 #ifndef __CONTIKI_CONF_H__
 #define __CONTIKI_CONF_H__
 
+#define NETSTACK_CONF_RADIO   ethernode_driver
+
 #define XMAC_CONF_ON_TIME RTIMER_SECOND
 #define XMAC_CONF_OFF_TIME RTIMER_SECOND * 2
 
@@ -35,7 +37,7 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: contiki-conf.h,v 1.12 2010/02/08 21:39:15 adamdunkels Exp $
+ * $Id: contiki-conf.h,v 1.13 2010/02/18 23:10:06 adamdunkels Exp $
  *
  */
 
diff --git a/platform/netsim/contiki-main.c b/platform/netsim/contiki-main.c
index b383b40f8..9e5433504 100644
--- a/platform/netsim/contiki-main.c
+++ b/platform/netsim/contiki-main.c
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-main.c,v 1.33 2009/03/17 15:56:32 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.34 2010/02/18 23:10:06 adamdunkels Exp $
  */
 
 #include "contiki.h"
@@ -126,10 +126,12 @@ contiki_main(int flag)
   uip_init();
  
   ctimer_init();
-  rime_init(nullmac_init(&ethernode_driver));
-  /*  rime_init(lpp_init(&ethernode_driver));*/
 
-  uip_over_mesh_init(2);
+  NETSTACK_RDC.init();
+  NETSTACK_MAC.init();
+  NETSTACK_NETWORK.init();
+
+    uip_over_mesh_init(2);
   uip_over_mesh_set_net(&meshif.ipaddr, &meshif.netmask);
       
   if(flag == 1) {