diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430
index 3d2f97620..5d54c0527 100644
--- a/cpu/msp430/Makefile.msp430
+++ b/cpu/msp430/Makefile.msp430
@@ -1,14 +1,4 @@
-# $Id: Makefile.msp430,v 1.13 2007/03/22 23:57:33 adamdunkels Exp $
-
-### Check if we are running under Windows
-
-ifndef WINDIR
-  ifdef OS
-    ifneq (,$(findstring Windows,$(OS)))
-      WINDIR := Windows
-    endif
-  endif
-endif
+# $Id: Makefile.msp430,v 1.14 2007/03/23 16:22:26 nifi Exp $
 
 ifdef nodeid
 CFLAGS += -DNODEID=$(nodeid)
@@ -111,13 +101,3 @@ else
 symbols.c symbols.h:
 	@${CONTIKI}/tools/make-empty-symbols
 endif
-
-### System dependent Makefile
-
-ifndef WINDIR
-  # settings for unix
-  -include ${CONTIKI}/cpu/msp430/buildscripts/Makefile.unix
-else
-  # settings for windows
-  -include ${CONTIKI}/cpu/msp430/buildscripts/Makefile.win
-endif
diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb
index d1a244cde..189b3cb05 100644
--- a/platform/esb/Makefile.esb
+++ b/platform/esb/Makefile.esb
@@ -1,4 +1,4 @@
-# $Id: Makefile.esb,v 1.5 2007/03/16 11:34:05 adamdunkels Exp $
+# $Id: Makefile.esb,v 1.6 2007/03/23 16:19:41 nifi Exp $
 
 SENSORS    = sensors.c irq.c button-sensor.c pir-sensor.c vib-sensor.c \
              sound-sensor.c radio-sensor.c ctsrts-sensor.c battery-sensor.c \
@@ -34,3 +34,26 @@ send:	$(CONTIKI)/tools/codeprop.c
 
 %.send:	%.cm send
 	send $(BASE_IP) $<
+
+### System dependent Makefile
+
+ifndef WINDIR
+  ifdef OS
+    ifneq (,$(findstring Windows,$(OS)))
+      WINDIR := Windows
+    endif
+  endif
+endif
+
+ifeq (${HOSTTYPE},FreeBSD)
+  # settings for FreeBSD
+  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.freebsd
+else
+ifndef WINDIR
+  # settings for unix
+  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.unix
+else
+  # settings for windows
+  -include $(CONTIKI)/platform/$(TARGET)/buildscripts/Makefile.win
+endif
+endif
diff --git a/cpu/msp430/buildscripts/Makefile.unix b/platform/esb/buildscripts/Makefile.freebsd
similarity index 78%
rename from cpu/msp430/buildscripts/Makefile.unix
rename to platform/esb/buildscripts/Makefile.freebsd
index bf1097601..489b4205b 100644
--- a/cpu/msp430/buildscripts/Makefile.unix
+++ b/platform/esb/buildscripts/Makefile.freebsd
@@ -1,5 +1,5 @@
 ifndef JTAG
-  JTAG := $(CONTIKI_CPU)/buildscripts/jtag/pyjtag/jtag.py
+  JTAG := $(CONTIKI)/platform/$(TARGET)/buildscripts/jtag/pyjtag/jtag.py
 endif
 
 ifndef JTAG_PORT
diff --git a/platform/esb/buildscripts/Makefile.unix b/platform/esb/buildscripts/Makefile.unix
new file mode 100644
index 000000000..782b49500
--- /dev/null
+++ b/platform/esb/buildscripts/Makefile.unix
@@ -0,0 +1,2 @@
+%.u:	%.ihex
+	msp430-jtag -eI $^
diff --git a/cpu/msp430/buildscripts/Makefile.win b/platform/esb/buildscripts/Makefile.win
similarity index 100%
rename from cpu/msp430/buildscripts/Makefile.win
rename to platform/esb/buildscripts/Makefile.win
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/_parjtag.so b/platform/esb/buildscripts/jtag/pyjtag/_parjtag.so
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/_parjtag.so
rename to platform/esb/buildscripts/jtag/pyjtag/_parjtag.so
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/elf.py b/platform/esb/buildscripts/jtag/pyjtag/elf.py
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/elf.py
rename to platform/esb/buildscripts/jtag/pyjtag/elf.py
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/gen-ihex.py b/platform/esb/buildscripts/jtag/pyjtag/gen-ihex.py
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/gen-ihex.py
rename to platform/esb/buildscripts/jtag/pyjtag/gen-ihex.py
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/install-pyjtag.nsi b/platform/esb/buildscripts/jtag/pyjtag/install-pyjtag.nsi
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/install-pyjtag.nsi
rename to platform/esb/buildscripts/jtag/pyjtag/install-pyjtag.nsi
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/jtag.py b/platform/esb/buildscripts/jtag/pyjtag/jtag.py
old mode 100755
new mode 100644
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/jtag.py
rename to platform/esb/buildscripts/jtag/pyjtag/jtag.py
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/license.txt b/platform/esb/buildscripts/jtag/pyjtag/license.txt
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/license.txt
rename to platform/esb/buildscripts/jtag/pyjtag/license.txt
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/makefile b/platform/esb/buildscripts/jtag/pyjtag/makefile
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/makefile
rename to platform/esb/buildscripts/jtag/pyjtag/makefile
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/readme.txt b/platform/esb/buildscripts/jtag/pyjtag/readme.txt
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/readme.txt
rename to platform/esb/buildscripts/jtag/pyjtag/readme.txt
diff --git a/cpu/msp430/buildscripts/jtag/pyjtag/setup.py b/platform/esb/buildscripts/jtag/pyjtag/setup.py
similarity index 100%
rename from cpu/msp430/buildscripts/jtag/pyjtag/setup.py
rename to platform/esb/buildscripts/jtag/pyjtag/setup.py