diff --git a/cpu/6502/ctk/ctk-mouse.c b/cpu/6502/ctk/ctk-mouse.c
index e7a94cdea..0c63d5f8a 100644
--- a/cpu/6502/ctk/ctk-mouse.c
+++ b/cpu/6502/ctk/ctk-mouse.c
@@ -58,9 +58,9 @@ ctk_mouse_init(void)
     if(okay) {
       okay = mouse_install(&mouse_def_callbacks, module_control.module) == MOUSE_ERR_OK;
       if(okay) {
-	atexit((void (*)(void))mouse_uninstall);
+        atexit((void (*)(void))mouse_uninstall);
       } else {
-	mod_free(module_control.module);
+        mod_free(module_control.module);
       }
     }
     cfs_close(module_control.callerdata);
diff --git a/cpu/6502/dhcp/dhcp-client.c b/cpu/6502/dhcp/dhcp-client.c
index 7a94d8580..8a4914338 100644
--- a/cpu/6502/dhcp/dhcp-client.c
+++ b/cpu/6502/dhcp/dhcp-client.c
@@ -214,21 +214,21 @@ PROCESS_THREAD(dhcp_process, ev, data)
       dhcpc_appcall(ev, data);
     } else if(ev == ctk_signal_button_activate) {   
       if(data == (process_data_t)&requestbutton) {
-	dhcpc_request();
-	set_statustext("Requesting...");
+        dhcpc_request();
+        set_statustext("Requesting...");
       }
       if(data == (process_data_t)&savebutton) {
-	apply_tcpipconfig();
-	app_quit();
+        apply_tcpipconfig();
+        app_quit();
       }
       if(data == (process_data_t)&cancelbutton) {
-	app_quit();
+        app_quit();
       }
     } else if(
 #if CTK_CONF_WINDOWCLOSE
-	      ev == ctk_signal_window_close ||
+              ev == ctk_signal_window_close ||
 #endif
-	      ev == PROCESS_EVENT_EXIT) {
+              ev == PROCESS_EVENT_EXIT) {
       app_quit();
     }
   }
diff --git a/cpu/6502/lib/config.c b/cpu/6502/lib/config.c
index b32f4a02a..08677a682 100644
--- a/cpu/6502/lib/config.c
+++ b/cpu/6502/lib/config.c
@@ -78,7 +78,7 @@ config_read(char *filename)
   }
 
   if(cfs_read(file, &config, sizeof(config)) < sizeof(config)
-					     - sizeof(config.ethernetcfg.name)) {
+                                             - sizeof(config.ethernetcfg.name)) {
     log_message(filename, ": No config file");
     error_exit();
   }
diff --git a/cpu/6502/net/ethernet-drv.c b/cpu/6502/net/ethernet-drv.c
index dc1018b5e..6c54022bb 100644
--- a/cpu/6502/net/ethernet-drv.c
+++ b/cpu/6502/net/ethernet-drv.c
@@ -71,10 +71,10 @@ pollhandler(void)
     } else if(BUF->type == uip_htons(UIP_ETHTYPE_ARP)) {
       uip_arp_arpin();
       /* If the above function invocation resulted in data that
-	 should be sent out on the network, the global variable
-	 uip_len is set to a value > 0. */
+         should be sent out on the network, the global variable
+         uip_len is set to a value > 0. */
       if(uip_len > 0) {
-	ethernet_send();
+        ethernet_send();
       }
     }
   }
diff --git a/cpu/6502/net/ethernet.c b/cpu/6502/net/ethernet.c
index 3f0b69dc2..c5eedc888 100644
--- a/cpu/6502/net/ethernet.c
+++ b/cpu/6502/net/ethernet.c
@@ -73,7 +73,7 @@ ethernet_init(struct ethernet_config *config)
   byte = mod_load(&module_control);
   if(byte != MLOAD_OK) {
     log_message(config->name, byte == MLOAD_ERR_MEM? ": Out of memory":
-						     ": No module");
+                                                     ": No module");
     error_exit();
   }
 
diff --git a/cpu/6502/sys/mtarch.c b/cpu/6502/sys/mtarch.c
index b0e2710af..096fe16c6 100644
--- a/cpu/6502/sys/mtarch.c
+++ b/cpu/6502/sys/mtarch.c
@@ -57,12 +57,12 @@ mtarch_remove(void)
 /*--------------------------------------------------------------------------*/
 void
 mtarch_start(struct mtarch_thread *thread,
-	     void (* function)(void *data),
-	     void *data)
+             void (* function)(void *data),
+             void *data)
 {
   memset(thread->cpustack, 0, sizeof(thread->cpustack));
   memset(thread->cstack,   0, sizeof(thread->cstack));
-  
+
   /* Copy current zero page content as template. */
   mtarch_asm_threadzp = thread->zp;
   mtarch_asm_start();
@@ -79,7 +79,7 @@ mtarch_start(struct mtarch_thread *thread,
   /* Setup the C stack with the data pointer. */
   thread->cstack[MTARCH_CSTACKSIZE - 2] = ((unsigned short)data) / 0x100; /* high byte of data pointer */
   thread->cstack[MTARCH_CSTACKSIZE - 3] = ((unsigned short)data) % 0x100; /* low  byte of data pointer */
-  
+
   /* Setup the C stack pointer. */
   thread->zp[1] = ((size_t)&thread->cstack[MTARCH_CSTACKSIZE - 3]) / 0x100; /* high byte of C stack pointer */
   thread->zp[0] = ((size_t)&thread->cstack[MTARCH_CSTACKSIZE - 3]) % 0x100; /* low  byte of C stack pointer */
@@ -100,7 +100,7 @@ mtarch_exec(struct mtarch_thread *thread)
 
   mtarch_asm_threadstack = thread->cpustack;  
   mtarch_asm_threadzp    = thread->zp;
-  
+
   mtarch_asm_exec();
 
   thread->spreg = mtarch_asm_threadspreg;  
diff --git a/platform/apple2enh/contiki-conf.h b/platform/apple2enh/contiki-conf.h
index dd17f1ee2..746248612 100644
--- a/platform/apple2enh/contiki-conf.h
+++ b/platform/apple2enh/contiki-conf.h
@@ -38,9 +38,9 @@
 #include "6502def.h"
 
 #define CTK_CONF_MENU_KEY         CH_ESC
-#define CTK_CONF_WINDOWSWITCH_KEY 0x17	/* Ctrl-W */
-#define CTK_CONF_WIDGETUP_KEY     0x01	/* Ctrl-A */
-#define CTK_CONF_WIDGETDOWN_KEY   '\t'	/* Tab or Ctrl-I */
+#define CTK_CONF_WINDOWSWITCH_KEY 0x17  /* Ctrl-W */
+#define CTK_CONF_WIDGETUP_KEY     0x01  /* Ctrl-A */
+#define CTK_CONF_WIDGETDOWN_KEY   '\t'  /* Tab or Ctrl-I */
 
 #define MOUSE_CONF_XTOC(x) ((x) * 2 / 7)
 #define MOUSE_CONF_YTOC(y) ((y) / 8)
diff --git a/platform/apple2enh/contiki-main.c b/platform/apple2enh/contiki-main.c
index e901e7f78..c529b137a 100644
--- a/platform/apple2enh/contiki-main.c
+++ b/platform/apple2enh/contiki-main.c
@@ -51,9 +51,9 @@
 #endif /* WITH_DNS */
 
 PROCINIT(&etimer_process,
-	 CTK_PROCESS
-	 RESOLV_PROCESS
-	 &tcpip_process);
+         CTK_PROCESS
+         RESOLV_PROCESS
+         &tcpip_process);
 
 void clock_update(void);
 
@@ -101,7 +101,7 @@ main(void)
   autostart_start(autostart_processes);
 
   log_message("Contiki up and running ...", "");
-  
+
   while(1) {
 
     process_run();
diff --git a/platform/atari/contiki-conf.h b/platform/atari/contiki-conf.h
index 903eb2666..f51608916 100644
--- a/platform/atari/contiki-conf.h
+++ b/platform/atari/contiki-conf.h
@@ -38,9 +38,9 @@
 #include "6502def.h"
 
 #define CTK_CONF_MENU_KEY         CH_ESC
-#define CTK_CONF_WINDOWSWITCH_KEY 0x17	/* Ctrl-W */
-#define CTK_CONF_WIDGETUP_KEY     0x01	/* Ctrl-A */
-#define CTK_CONF_WIDGETDOWN_KEY   '\t'	/* Tab or Ctrl-I */
+#define CTK_CONF_WINDOWSWITCH_KEY 0x17  /* Ctrl-W */
+#define CTK_CONF_WIDGETUP_KEY     0x01  /* Ctrl-A */
+#define CTK_CONF_WIDGETDOWN_KEY   '\t'  /* Tab or Ctrl-I */
 
 #define textcolor(color) COLOR_WHITE
 
diff --git a/platform/atari/contiki-main.c b/platform/atari/contiki-main.c
index 1cdacd11f..fa4fd7844 100644
--- a/platform/atari/contiki-main.c
+++ b/platform/atari/contiki-main.c
@@ -51,9 +51,9 @@
 #endif /* WITH_DNS */
 
 PROCINIT(&etimer_process,
-	 CTK_PROCESS
-	 RESOLV_PROCESS
-	 &tcpip_process);
+         CTK_PROCESS
+         RESOLV_PROCESS
+         &tcpip_process);
 
 /*-----------------------------------------------------------------------------------*/
 void
@@ -97,7 +97,7 @@ main(void)
   autostart_start(autostart_processes);
 
   log_message("Contiki up and running ...", "");
-  
+
   while(1) {
 
     process_run();
diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c
index b0e90aaa4..f870fa95a 100644
--- a/platform/c128/contiki-main.c
+++ b/platform/c128/contiki-main.c
@@ -53,9 +53,9 @@
 #endif /* WITH_DNS */
 
 PROCINIT(&etimer_process,
-	 CTK_PROCESS
-	 RESOLV_PROCESS
-	 &tcpip_process);
+         CTK_PROCESS
+         RESOLV_PROCESS
+         &tcpip_process);
 
 /*-----------------------------------------------------------------------------------*/
 void
@@ -115,7 +115,7 @@ main(void)
   autostart_start(autostart_processes);
 
   log_message("Contiki up and running ...", "");
-  
+
   while(1) {
 
     process_run();
diff --git a/platform/c64/contiki-main.c b/platform/c64/contiki-main.c
index 8f9de4388..d6e46f1be 100644
--- a/platform/c64/contiki-main.c
+++ b/platform/c64/contiki-main.c
@@ -53,9 +53,9 @@
 #endif /* WITH_DNS */
 
 PROCINIT(&etimer_process,
-	 CTK_PROCESS
-	 RESOLV_PROCESS
-	 &tcpip_process);
+         CTK_PROCESS
+         RESOLV_PROCESS
+         &tcpip_process);
 
 /*-----------------------------------------------------------------------------------*/
 void
@@ -113,7 +113,7 @@ main(void)
   autostart_start(autostart_processes);
 
   log_message("Contiki up and running ...", "");
-  
+
   while(1) {
 
     process_run();