diff --git a/cpu/avr/dev/clock.c b/cpu/avr/dev/clock.c
index a24afaa8c..8b0be51ab 100644
--- a/cpu/avr/dev/clock.c
+++ b/cpu/avr/dev/clock.c
@@ -12,7 +12,7 @@ volatile unsigned long seconds;
 long sleepseconds;
 
 /* Set RADIOSTATS to monitor radio on time (must also be set in the radio driver) */
-#if RF230BB && WEBSERVER
+#if RF230BB && AVR_WEBSERVER
 #define RADIOSTATS 1
 #endif
 
diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index 8383327d4..887d9057e 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
@@ -142,7 +142,7 @@ struct timestamp {
 #endif
 
 /* See clock.c and httpd-cgi.c for RADIOSTATS code */
-#if WEBSERVER
+#if AVR_WEBSERVER
 #define RADIOSTATS 1
 #endif
 #if RADIOSTATS
diff --git a/platform/avr-atmega128rfa1/contiki-main.c b/platform/avr-atmega128rfa1/contiki-main.c
index 562a53855..41fccfebe 100644
--- a/platform/avr-atmega128rfa1/contiki-main.c
+++ b/platform/avr-atmega128rfa1/contiki-main.c
@@ -74,7 +74,7 @@
 #include "raven-lcd.h"
 #endif
 
-#if WEBSERVER
+#if AVR_WEBSERVER
 #include "httpd-fs.h"
 #include "httpd-cgi.h"
 #endif
@@ -125,7 +125,7 @@ FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
 /* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
 
 /* Put default MAC address in EEPROM */
-#if WEBSERVER
+#if AVR_WEBSERVER
 extern uint8_t mac_address[8];     //These are defined in httpd-fsdata.c via makefsdata.h
 extern uint8_t server_name[16];
 extern uint8_t domain_name[30];
@@ -354,7 +354,7 @@ uint8_t i;
 /*--------------------------Announce the configuration---------------------*/
 #if ANNOUNCE_BOOT
 
-#if WEBSERVER
+#if AVR_WEBSERVER
   uint8_t i;
   char buf[80];
   unsigned int size;
@@ -385,7 +385,7 @@ uint8_t i;
 
 #else
    PRINTA("Online\n");
-#endif /* WEBSERVER */
+#endif /* AVR_WEBSERVER */
 
 #endif /* ANNOUNCE_BOOT */
 }
diff --git a/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c b/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
index 2b6d77386..95e4bc8de 100644
--- a/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
+++ b/platform/avr-raven/apps/raven-lcd-interface/raven-lcd.c
@@ -66,7 +66,7 @@
 #include "contiki-lib.h"
 #include "contiki-net.h"
 
-#if WEBSERVER
+#if AVR_WEBSERVER
 #include "webserver-nogui.h"
 #include "httpd-cgi.h"
 #endif
@@ -306,13 +306,13 @@ raven_gui_loop(process_event_t ev, process_data_t data)
                 raven_ping6();
                 break;
             case SEND_TEMP:
-#if WEBSERVER
+#if AVR_WEBSERVER
                 /* Set temperature string in web server */
                 web_set_temp((char *)cmd.frame);
 #endif
                 break;
             case SEND_ADC2:
-#if WEBSERVER
+#if AVR_WEBSERVER
                 /* Set ext voltage string in web server */
                 web_set_voltage((char *)cmd.frame);
 #endif
@@ -449,7 +449,7 @@ raven_lcd_show_text(char *text) {
     send_frame(REPORT_TEXT_MSG, textlen, (uint8_t *) text);
 }
 
-#if WEBSERVER
+#if AVR_WEBSERVER
 static void
 lcd_show_servername(void) {
 
@@ -469,7 +469,7 @@ PROCESS_THREAD(raven_lcd_process, ev, data)
 
   PROCESS_BEGIN();
 
-#if WEBSERVER
+#if AVR_WEBSERVER
   lcd_show_servername();
 #endif
 
diff --git a/platform/avr-raven/apps/raven-webserver/Makefile.raven-webserver b/platform/avr-raven/apps/raven-webserver/Makefile.raven-webserver
index 632bf1d09..16428b490 100644
--- a/platform/avr-raven/apps/raven-webserver/Makefile.raven-webserver
+++ b/platform/avr-raven/apps/raven-webserver/Makefile.raven-webserver
@@ -4,7 +4,7 @@ raven-webserver_src = webserver-nogui.c httpd.c http-strings.c psock.c memb.c \
 raven-webserver_dsc = webserver-dsc.c
 
 #Tell platform main routine webserver is present, for parameter display at startup
-CFLAGS             += -DWEBSERVER
+CFLAGS             += -DAVR_WEBSERVER
 
 #$(CONTIKI)/apps/webserver/http-strings.c: $(CONTIKI)/apps/webserver/http-strings
 #	cd $(CONTIKI)/apps/webserver/; $(CONTIKI)/tools/makestrings $<
diff --git a/platform/avr-raven/contiki-raven-main.c b/platform/avr-raven/contiki-raven-main.c
index 722d90bc8..71220e43d 100644
--- a/platform/avr-raven/contiki-raven-main.c
+++ b/platform/avr-raven/contiki-raven-main.c
@@ -76,7 +76,7 @@
 #include "raven-lcd.h"
 #endif
 
-#if WEBSERVER
+#if AVR_WEBSERVER
 #include "httpd-fs.h"
 #include "httpd-cgi.h"
 #endif
@@ -125,7 +125,7 @@ FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
 /* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
 
 /* Put default MAC address in EEPROM */
-#if WEBSERVER
+#if AVR_WEBSERVER
 extern uint8_t mac_address[8];     //These are defined in httpd-fsdata.c via makefsdata.h
 extern uint8_t server_name[16];
 extern uint8_t domain_name[30];
@@ -340,7 +340,7 @@ uint8_t i;
 /*--------------------------Announce the configuration---------------------*/
 #if ANNOUNCE_BOOT
 
-#if WEBSERVER
+#if AVR_WEBSERVER
   uint8_t i;
   char buf[80];
   unsigned int size;
@@ -371,7 +371,7 @@ uint8_t i;
 
 #else
    PRINTF("Online\n");
-#endif /* WEBSERVER */
+#endif /* AVR_WEBSERVER */
 
 #endif /* ANNOUNCE_BOOT */
 }