diff --git a/platform/gtk/contiki-main.c b/platform/gtk/contiki-main.c
index 2e49b4e63..ec57ec1cc 100644
--- a/platform/gtk/contiki-main.c
+++ b/platform/gtk/contiki-main.c
@@ -29,10 +29,12 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: contiki-main.c,v 1.5 2007/05/19 21:16:08 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.6 2007/05/22 21:27:55 oliverschmidt Exp $
  *
  */
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <gdk/gdktypes.h>
 #include <gtk/gtk.h>
 
@@ -44,7 +46,7 @@
 #include "ctk/ctk-vncserver.h"
 #include "ctk/ctk-termtelnet.h"
 
-#include "net/tapdev-service.h"
+#include "net/tapdev-drv.h"
 #include "program-handler.h"
 #include "webserver.h"
 #include "ctk/ctk-gtksim-service.h"
@@ -64,11 +66,9 @@
 
 #include "cmdd.h"
 
-u8_t tapdev_output(void);
 static struct uip_fw_netif tapif =
   {UIP_FW_NETIF(0,0,0,0, 0,0,0,0, tapdev_output)};
 
-
 PROCESS(init_process, "Init");
 
 PROCESS_THREAD(init_process, ev, data)
@@ -111,7 +111,6 @@ PROCESS_THREAD(init_process, ev, data)
   PROCESS_END();
 }
 
-
 PROCINIT(&tcpip_process, &ctk_process, &tapdev_process,
 	 &ctk_gtksim_service_process, &resolv_process,
 	 &program_handler_process,
@@ -125,11 +124,16 @@ idle_callback(gpointer data)
   return TRUE;
 }
 /*-----------------------------------------------------------------------------------*/
+void
+exit_handler(void)
+{
+  process_post_synch(&tapdev_process, PROCESS_EVENT_EXIT, NULL);
+}
+/*-----------------------------------------------------------------------------------*/
 int
 main(int argc, char **argv)
 {
   uip_ipaddr_t addr;
-  
 
   gtk_init(&argc, &argv);
   
@@ -162,10 +166,11 @@ main(int argc, char **argv)
 
   uip_fw_default(&tapif);
   
+  atexit(exit_handler);
+
   gtk_timeout_add(20, idle_callback, NULL);
   gtk_main();
-    
-    
+
   return 0;
 
   argv = argv;