diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index c54d1e1..f0c98a8 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -39,4 +39,7 @@
 ondavx747.c
 #elif defined(CREATIVE_ZVx)
 creativezvm.c
+#elif defined(HAVE_AS3525)
+sansa_as3525.c
+show_logo.c
 #endif
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
new file mode 100644
index 0000000..297fb2e
--- /dev/null
+++ b/bootloader/sansa_as3525.c
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id:$
+ *
+ * Copyright (C) 2008 by Rafaël Carré
+ *
+ * Based on Rockbox iriver bootloader by Linus Nielsen Feltzing
+ * and the ipodlinux bootloader by Daniel Palffy and Bernard Leach
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <system.h>
+#include <inttypes.h>
+#include "lcd.h"
+#include "common.h"
+#include "config.h"
+
+int show_logo(void);
+void main(void)
+{
+    lcd_init_device();
+    lcd_clear_display();
+
+    lcd_update();
+
+    lcd_enable(true);
+
+    show_logo();
+
+#ifdef SANSA_CLIP
+    /* Use hardware scrolling */
+
+    lcd_write_command(0x26); /* scroll setup */
+    lcd_write_command(0x01); /* columns scrolled per step */
+    lcd_write_command(0x00); /* start page */
+    lcd_write_command(0x00); /* steps freqency */
+    lcd_write_command(0x07); /* end page (including) */
+
+    lcd_write_command(0x2F); /* start horizontal scrolling */
+#endif
+
+    /* never returns */
+    while(1) ;
+}
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c
index b0cac33..b655e51 100644
--- a/bootloader/show_logo.c
+++ b/bootloader/show_logo.c
@@ -29,8 +29,12 @@
 int show_logo( void )
 {
     char boot_version[32];
-    
+
+#if LCD_WIDTH <= 128
+    snprintf(boot_version, sizeof(boot_version), "Boot %s", APPSVERSION);
+#else
     snprintf(boot_version, sizeof(boot_version), "Boot Ver. %s", APPSVERSION);
+#endif
 
     lcd_clear_display();
     lcd_bitmap(rockboxlogo, 0, 10, BMPWIDTH_rockboxlogo, BMPHEIGHT_rockboxlogo);