diff --git a/apps/codeprop/codeprop-tmp.c b/apps/codeprop/codeprop-tmp.c
index 5f81ea71f..662cf94b2 100644
--- a/apps/codeprop/codeprop-tmp.c
+++ b/apps/codeprop/codeprop-tmp.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: codeprop-tmp.c,v 1.2 2006/07/06 14:55:21 nifi Exp $
+ * @(#)$Id: codeprop-tmp.c,v 1.3 2006/12/18 15:17:47 fros4943 Exp $
  */
 
 /** \addtogroup esb
@@ -73,7 +73,7 @@
 #include "contiki-net.h"
 #include "cfs/cfs.h"
 #include "codeprop-tmp.h"
-#include "loader/elfloader-tmp.h"
+#include "loader/elfloader.h"
 #include <string.h>
 
 static const char *err_msgs[] =
diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr
index 735dad9ca..2d2e2fed0 100644
--- a/cpu/avr/Makefile.avr
+++ b/cpu/avr/Makefile.avr
@@ -1,4 +1,4 @@
-# $Id: Makefile.avr,v 1.3 2006/06/24 06:23:47 adamdunkels Exp $
+# $Id: Makefile.avr,v 1.4 2006/12/18 15:20:48 fros4943 Exp $
 
 ### Check if we are running under Windows
 
@@ -21,7 +21,7 @@ SENSORS    = #sensors.c button.c pir.c irq.c vib.c sound.c radio.c ctsrts.c \
              #lm71.c
 UIPDRIVERS = #me.c me_tabs.c slip.c tr1001-drv.c tr1001.c crc16.c
 SYSAPPS    = #codeprop.c
-ELFLOADER  = #loader-arch.c elfloader-tmp.c elfloader-avr.c symtab.c
+ELFLOADER  = #loader-arch.c elfloader.c elfloader-avr.c symtab.c
 TARGETLIBS = clock.c flash.c
 
 CONTIKI_TARGET_SOURCEFILES += $(SENSORS) \
diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430
index 5ca539e2d..84160856e 100644
--- a/cpu/msp430/Makefile.msp430
+++ b/cpu/msp430/Makefile.msp430
@@ -1,4 +1,4 @@
-# $Id: Makefile.msp430,v 1.8 2006/12/18 11:48:18 adamdunkels Exp $
+# $Id: Makefile.msp430,v 1.9 2006/12/18 15:20:36 fros4943 Exp $
 
 ### Check if we are running under Windows
 
@@ -28,7 +28,7 @@ UIPDRIVERS = me.c me_tabs.c slip.c crc16.c
 SYSAPPS    = codeprop-tmp.c
 APPDIRS += $(CONTIKI)/apps/codeprop
 #ELFLOADER  = loader-arch.c elfloader.c elfloader-msp430.c symtab.c
-ELFLOADER  = elfloader-tmp.c elfloader-msp430.c symtab.c
+ELFLOADER  = elfloader.c elfloader-msp430.c symtab.c
 TARGETLIBS = random.c serial.c
 
 CONTIKI_TARGET_SOURCEFILES += $(MSP430) \