diff --git a/contiki-cpc/Makefile.common b/contiki-cpc/Makefile.common
index 0c3c9e9..afb124a 100644
--- a/contiki-cpc/Makefile.common
+++ b/contiki-cpc/Makefile.common
@@ -1,7 +1,7 @@
 CC=sdcc
-AS=as-z80
-CL=link-z80
-LD=link-z80
+AS=sdasz80
+CL=sdldz80
+LD=sdldz80
 
 CFLAGSCOMMON= \
 	-I apps \
@@ -18,7 +18,8 @@
 	-I $(CONTIKI)/ppp \
 	-I $(CONTIKI)/uip \
 	-mz80 -D__fastcall__=/**/ -D__CPC__ -DCLK_TCK=16384 \
-	--no-std-crt0 --opt-code-size --peep-file ~/peeph/peep.def
+	-DCTK_CONIO \
+	--no-std-crt0 --opt-code-size
 
 CLFLAGS= 
 OPT=
diff --git a/contiki-cpc/Makefile.cpc b/contiki-cpc/Makefile.cpc
index bd22100..aa80d78 100644
--- a/contiki-cpc/Makefile.cpc
+++ b/contiki-cpc/Makefile.cpc
@@ -39,7 +39,6 @@
 
 CFLAGS:=$(CFLAGSCOMMON) --compile-only \
         -DWITH_ASCII \
-	-DCTK_CONIO \
 	-DWITH_LOADER_ARCH \
 	-DWITH_LOADER_ARCH=1
 
@@ -100,13 +99,15 @@
 	./loader/cfs-cpc.o \
 	./arch/main.o \
 	./arch/arch.o \
+	./lib/strcasecmp.o \
 	$(UIP)
 
 
 contiki: $(CONTIKI_OBJ)
 	$(LD) -f arch/contiki.lnk
-	./bin/make_labels -a _CODE -a _DATA -x _main -x __clock -x _exit contiki.map arch/contiki_labels.s
-	./bin/makebin -p -b 256 -s 65535 < contiki.ihx > temp/contiki.bin
-	./bin/addhead -s 256 -t "binary" -x 256 temp/contiki.bin temp/contiki_ams.bin
-	./bin/cpcxfs contiki.dsk -f -b -p temp/contiki_ams.bin contiki.bin
+	#./bin/make_labels -a _CODE -a _DATA -x _main -x __clock -x _exit contiki.map arch/contiki_labels.s
+	makebin -p -s 65535 < contiki.ihx > contiki.raw
+	dd if=contiki.raw of=contiki.bin bs=256 skip=1
+	cpcfs contiki.dsk f
+	cpcfs contiki.dsk p contiki.bin,256,256 -b -e
 
diff --git a/contiki-cpc/Makefile.netprogs b/contiki-cpc/Makefile.netprogs
index 097026f..4743d21 100644
--- a/contiki-cpc/Makefile.netprogs
+++ b/contiki-cpc/Makefile.netprogs
@@ -77,7 +77,7 @@
 	$(MAKE_DSC)
 
 define MAKE_PRG
-	bin/makelnk -r -m -o $@.ihx -k /usr/local/share/sdcc/lib/z80 -l z80 arch/crt0-prg.o loader/loader-arch-module.o arch/contiki_labels.o $^ > $@.lnk
+	bin/makelnk -r -m -o $@.ihx -k /usr/share/sdcc/lib/z80 -l z80 arch/crt0-prg.o loader/loader-arch-module.o arch/contiki_labels.o $^ > $@.lnk
 	$(LD) -f $@.lnk
 	bin/makebin -p -b 0 -s 65535 < $@.ihx > $@.bin
 	bin/addhead  $@.bin $@.bin.ams
diff --git a/contiki-cpc/Makefile.programs b/contiki-cpc/Makefile.programs
index 75b1c76..f812820 100644
--- a/contiki-cpc/Makefile.programs
+++ b/contiki-cpc/Makefile.programs
@@ -98,7 +98,7 @@
 	$(MAKE_DSC)
 
 define MAKE_PRG
-	bin/makelnk -r -m -o $@.ihx -k /usr/local/share/sdcc/lib/z80 -l z80 arch/crt0-prg.o loader/loader-arch-module.o arch/contiki_labels.o $^ > $@.lnk
+	bin/makelnk -r -m -o $@.ihx -k /usr/share/sdcc/lib/z80 -l z80 arch/crt0-prg.o loader/loader-arch-module.o arch/contiki_labels.o $^ > $@.lnk
 	$(LD) -f $@.lnk
 	bin/makebin -p -b 0 -s 65535 < $@.ihx > $@.bin
 	bin/addhead  $@.bin $@.bin.ams