diff --git a/cpu/z80/Makefile.z80 b/cpu/z80/Makefile.z80
index 1255a9ef6..fd1c5a028 100644
--- a/cpu/z80/Makefile.z80
+++ b/cpu/z80/Makefile.z80
@@ -2,7 +2,7 @@
 # Makefile for z80/SDCC
 # @author Takahide Matsutsuka <markn@markn.org>
 #
-# $Id: Makefile.z80,v 1.2 2007/09/01 11:14:52 matsutsuka Exp $
+# $Id: Makefile.z80,v 1.3 2007/09/09 12:20:12 matsutsuka Exp $
 #
 
 ### Compiler definitions
@@ -14,16 +14,14 @@ AR	 = sdcclib
 OBJCOPY  = objcopy
 STRIP    = strip
 
-CFLAGS  += -I. -I$(CONTIKI) -I$(CONTIKI)/core -I$(CONTIKI_CPU) \
-           ${addprefix -I$(CONTIKI)/platform/$(TARGET)/,$(CONTIKI_TARGET_DIRS)} \
-           ${addprefix -I,$(APPDIRS)} $(APP_INCLUDES) \
-           --std-c99 --vc -mz80
-
+CFLAGS  += --std-c99 --vc -mz80
 ASFLAGS += -l
 LDFLAGS += -mz80
-AROPTS = -a
+AROPTS   = -a
 
-CONTIKI_SOURCEFILES += strcasecmp.c mtarch.c uip_arch.c
+CONTIKI_CPU_DIRS = . dev lib
+CONTIKI_SOURCEFILES += strcasecmp.c mtarch.c uip_arch.c \
+	log-conio.c libconio_arch.c rs-232.c
 CONTIKI_ASMFILES += uip_arch-asm.S
 
 contiki-$(TARGET).o: $(CONTIKI_OBJECTFILES) $(PROJECT_OBJECTFILES) $(CONTIKI_ASMOBJECTFILES)
@@ -32,8 +30,3 @@ contiki-$(TARGET).o: $(CONTIKI_OBJECTFILES) $(PROJECT_OBJECTFILES) $(CONTIKI_ASM
 contiki.ihex: contiki-$(TARGET).o
 	$(LD) $(LDFLAGS) -DAUTOSTART_ENABLE $(CONTIKI_TARGET_MAIN) -lcontiki-$(TARGET).o -o $@
 
-CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
-$(OBJECTDIR)/%.o: %.S
-	$(AS) $(ASFLAGS) -o $@ $<
-
-#CONTIKI_TARGET_DIRS += $(CONTIKI_CPU)/net