diff --git a/platform/pc-6001/Makefile b/platform/pc-6001/Makefile
index 70ab17b3b..a98123b5a 100644
--- a/platform/pc-6001/Makefile
+++ b/platform/pc-6001/Makefile
@@ -2,13 +2,14 @@
 # Makefile for PC-6001 using z80/SDCC
 # @author Takahide Matsutsuka <markn@markn.org>
 #
-# $Id: Makefile,v 1.2 2007/09/19 12:44:45 matsutsuka Exp $
+# $Id: Makefile,v 1.3 2007/09/29 04:07:00 matsutsuka Exp $
 #
 
 CONTIKI = ../..
 TARGET=pc-6001
 APPS_DESKTOP = program-handler calc process-list shell about
-APPS_NETWORK = netconf cmdd
+APPS_NETWORK_CLIENT = $(APPS_DESKTOP) netconf webbrowser email telnet ftp irc
+APPS_NETWORK_SERVER = netconf cmdd
 
 #	editor netconf dhcp webbrowser ftp irc email telnet telnetd
 #	cmdd codeprop webserver vnc
@@ -48,11 +49,15 @@ serial:
 rom:
 	rm -f contiki.ihex;
 	make contiki.rom MEMORY=ROM CONTIKI_TARGET_MAIN=contiki-rom-main.c
-slip:
+server:
 	rm -f contiki.ihex;
-	make contiki APPS="$(APPS_NETWORK)" PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)" CONTIKI_TARGET_MAIN=contiki-slip-main.c
-web:
+	make contiki APPS="$(APPS_NETWORK_SERVER)" PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)" CONTIKI_TARGET_MAIN=contiki-server-main.c
+client:
 	rm -f contiki.ihex;
-	make contiki APPS="$(APPS_DESKTOP) $(APPS_NETWORK)" PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)" CONTIKI_TARGET_MAIN=contiki-web-main.c
+	make contiki APPS="$(APPS_NETWORK_CLIENT)" PLATFORM_APPS="$(PLATFORM_APPS_NETWORK)" CONTIKI_TARGET_MAIN=contiki-client-main.c
+
+romdump:
+	rm -f contiki.ihex;
+	make contiki MEMORY=16K CONTIKI_TARGET_MAIN=romdump.c
 
 include $(CONTIKI)/Makefile.include
diff --git a/platform/pc-6001/Makefile.pc-6001 b/platform/pc-6001/Makefile.pc-6001
index cd144932a..1e3164d61 100644
--- a/platform/pc-6001/Makefile.pc-6001
+++ b/platform/pc-6001/Makefile.pc-6001
@@ -2,7 +2,7 @@
 # Makefile for PC-6001 using z80/SDCC
 # @author Takahide Matsutsuka <markn@markn.org>
 #
-# $Id: Makefile.pc-6001,v 1.3 2007/09/19 12:44:45 matsutsuka Exp $
+# $Id: Makefile.pc-6001,v 1.4 2007/09/29 04:07:00 matsutsuka Exp $
 #
 
 ifndef CONTIKI
@@ -27,19 +27,18 @@ endif
 PLATFORM = $(CONTIKI)/platform/$(TARGET)
 CONTIKI_TARGET_DIRS = . ctk dev loader
 CFLAGS  += -DMEMORY_$(MEMORY) -DARCH_$(ARCH)
-LDFLAGS += $(CFLAGS) --opt-code-size --out-fmt-ihx --main-return
-
+LDFLAGS += 
 ifeq ($(MEMORY),16K)
-  LDFLAGS      += --code-loc 0xc41d --data-loc
+  LDFLAGS      += --code-loc 0xc40f --data-loc 0
   HEX2CASFLAGS  = -1 -n contki -o contiki.p6
 else ifeq ($(MEMORY),ROM)
   LDFLAGS      += --code-loc 0x4004 --data-loc 0xf000
   HEX2CASFLAGS  = -r -o contiki.rom
 else ifeq ($(ARCH),PC6001MK2)
-  LDFLAGS      += --code-loc 0x801d --data-loc
+  LDFLAGS      += --code-loc 0x800f --data-loc 0
   HEX2CASFLAGS  = -5 -o contiki2.p6
 else
-  LDFLAGS      += --code-loc 0x841d --data-loc
+  LDFLAGS      += --code-loc 0x840f --data-loc 0
   HEX2CASFLAGS  = -2 -n contki -o contiki.p6
 endif
 
@@ -56,11 +55,11 @@ endif
 
 CONTIKI_TARGET_SOURCEFILES = \
 	$(CTK) cfs-ram.c serial.c slip.c \
-	ctk-conio_arch.c libconio.c
+	resolv.c \
+	ctk-conio_arch.c $(CONTIKI_TARGET_MAIN)
 
-#	ctk-conio.c
-
-#you can use the below instead of ctk-conio_arch.c and ctk-conio_arch-asm.cS
+#you can use the below instead of ctk-conio_arch.c, ctk-conio_arch-asm.cS,
+# and libconio_arch-asm.cS
 #ctk-conio_arch-source.c
 
 CONTIKI_ASMFILES  += getkey.S isprint_arch.S clock.S rs232-asm.S
@@ -68,15 +67,15 @@ CONTIKI_CASMFILES += ctk-conio_arch-asm.cS libconio_arch-asm.cS
 
 CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
 
-CLEAN += *.asm *.lnk *.sym *.o *.a *.cas *.rom *.p6
+CLEAN += *.rom *.p6 *.asm
 
 contiki: contiki.p6
 
 .SUFFIXES:
 
-%.p6:	%.ihex
+%.p6:	%.ihx
 	$(HEX2CAS) $(HEX2CASFLAGS) $<
-%.rom:	%.ihex
+%.rom:	%.ihx
 	$(HEX2CAS) $(HEX2CASFLAGS) $<
 
 remove-ctk: