Index: bootloader/main-pp.c
===================================================================
--- bootloader/main-pp.c	(Revision 19124)
+++ bootloader/main-pp.c	(Arbeitskopie)
@@ -23,6 +23,8 @@
  ****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+
+#include "config.h"
 #include "common.h"
 #include "cpu.h"
 #include "file.h"
@@ -292,7 +294,7 @@
     unsigned long sum;
     char filename[MAX_PATH];
 
-    snprintf(filename,sizeof(filename),"/.rockbox/%s",firmware);
+    snprintf(filename,sizeof(filename), BOOTDIR "/%s",firmware);
     fd = open(filename, O_RDONLY);
     if(fd < 0)
     {
Index: bootloader/gigabeat-s.c
===================================================================
--- bootloader/gigabeat-s.c	(Revision 19124)
+++ bootloader/gigabeat-s.c	(Arbeitskopie)
@@ -266,8 +266,8 @@
             {
                 printf("Found rockbox binary. Moving...");
                 close(fd);
-                remove("/.rockbox/rockbox.gigabeat");
-                int ret = rename(buf, "/.rockbox/rockbox.gigabeat");
+                remove( BOOTDIR "/" BOOTFILE);
+                int ret = rename(buf, BOOTDIR "/" BOOTFILE);
                 printf("returned %d", ret);
                 sleep(HZ);
                 break;
@@ -299,7 +299,7 @@
 /* Try to load the firmware and run it */
 static void __attribute__((noreturn)) handle_firmware_load(void)
 {
-    int rc = load_firmware(load_buf, "/.rockbox/rockbox.gigabeat",
+    int rc = load_firmware(load_buf, BOOTFILE,
                            load_buf_size);
 
     if(rc < 0)
Index: bootloader/iaudio_coldfire.c
===================================================================
--- bootloader/iaudio_coldfire.c	(Revision 19124)
+++ bootloader/iaudio_coldfire.c	(Arbeitskopie)
@@ -216,7 +216,7 @@
 
     if (i < EOK) {
         printf("Error!");
-        printf("Can't load rockbox.iaudio:");
+        printf("Can't load " BOOTFILE " :");
         printf(strerror(rc));
         sleep(HZ*3);
         power_off();
Index: bootloader/common.c
===================================================================
--- bootloader/common.c	(Revision 19124)
+++ bootloader/common.c	(Arbeitskopie)
@@ -29,6 +29,7 @@
 #include "common.h"
 #include "power.h"
 #include "kernel.h"
+#include "config.h"
 
 /* TODO: Other bootloaders need to be adjusted to set this variable to true
    on a button press - currently only the ipod, H10 and Sansa versions do. */
@@ -141,7 +142,7 @@
     int i;
     char filename[MAX_PATH];
 
-    snprintf(filename,sizeof(filename),"/.rockbox/%s",firmware);
+    snprintf(filename,sizeof(filename), BOOTDIR "/%s",firmware);
     fd = open(filename, O_RDONLY);
     if(fd < 0)
     {
Index: bootloader/ipod.c
===================================================================
--- bootloader/ipod.c	(Revision 19124)
+++ bootloader/ipod.c	(Arbeitskopie)
@@ -348,7 +348,7 @@
         rc=load_firmware(loadbuffer, BOOTFILE, MAX_LOADSIZE);
         if (rc < EOK) {
             printf("Error!");
-            printf("Can't load rockbox.ipod:");
+            printf("Can't load " BOOTFILE " " :");
             printf(strerror(rc));
         } else {
             printf("Rockbox loaded.");