diff --git a/platform/esb/Makefile.esb b/platform/esb/Makefile.esb
index 0ab4149e0..2a0f0029e 100644
--- a/platform/esb/Makefile.esb
+++ b/platform/esb/Makefile.esb
@@ -1,23 +1,27 @@
-# $Id: Makefile.esb,v 1.1 2006/06/17 22:41:27 adamdunkels Exp $
+# $Id: Makefile.esb,v 1.2 2006/10/06 07:58:19 adamdunkels 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 \
              temperature-sensor.c
-ESB        = ir.c beep.c ds1629.c tr1001-drv.c tr1001.c esb-sensors.c
+ESB        = ir.c beep.c ds1629.c tr1001-drv.c tr1001-gcr.c gcr.c esb-sensors.c node-id.c
 CONTIKI_TARGET_DIRS = . dev apps net loader
+ifndef CONTIKI_TARGET_MAIN
 CONTIKI_TARGET_MAIN = contiki-esb-main.c
+endif
 
 CONTIKI_TARGET_SOURCEFILES += $(SENSORS) $(ESB) \
         contiki-esb-default-init-lowlevel.c \
         contiki-esb-default-init-apps.c contiki-esb-default-init-net.c \
 	rs232.c fader.c $(CONTIKI_TARGET_MAIN)
 
-PROJECT_OBJECTFILES += $(OBJECTDIR)/contiki-esb-main.o
+include $(CONTIKI)/platform/$(TARGET)/apps/Makefile.apps
+
+#PROJECT_OBJECTFILES += $(OBJECTDIR)/contiki-esb-main.o
 
 MCU=msp430x149
 include $(CONTIKI)/cpu/msp430/Makefile.msp430
 
-contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,node-id.o symbols.o}
+contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
 #	$(AR) rcf $@ $^
 
 ifndef BASE_IP