diff --git a/conf/messages.xml b/conf/messages.xml
index c0f85e72fb..1a515899e2 100644
--- a/conf/messages.xml
+++ b/conf/messages.xml
@@ -345,7 +345,7 @@
     <field name="energy"   type="float" unit="Wh"/>
   </message>
 
-  <message name="SVINFO" ID="16">
+  <message name="SVSINFO" ID="16">
       <field name="ac_id" type="string"/>
       <field name="svid"  type="string" format="csv"/>
       <field name="flags" type="string" format="csv"/>
diff --git a/sw/airborne/bootloader/Makefile b/sw/airborne/bootloader/Makefile
index 6c8cf9dd82..a13e2db45d 100644
--- a/sw/airborne/bootloader/Makefile
+++ b/sw/airborne/bootloader/Makefile
@@ -14,8 +14,8 @@ ARCH      = atmega128
 # low_fuse e1
 #
 
-# bootloader base in bytes
-BL_BASE = 0x1800
+# bootloader base in bytes (0xF000 in words)
+BL_BASE = 0x1E00
 
 bootloader.elf: bootloader.c
 	avr-gcc -Wall -mmcu=$(ARCH) -Ttext $(BL_BASE) -o $@ $<
diff --git a/sw/airborne/bootloader/bootloader.c b/sw/airborne/bootloader/bootloader.c
index 2b0879e197..4fb7d6c7df 100644
--- a/sw/airborne/bootloader/bootloader.c
+++ b/sw/airborne/bootloader/bootloader.c
@@ -3,7 +3,11 @@
 #include <avr/boot.h>
 #include <avr/pgmspace.h>
 
-#define BL_SIZE 1024
+/* mega128
+   FLASHEND => 0x1FFFF (131071)
+*/
+
+#define BL_SIZE 4096 /* words */
 #define APP_END (FLASHEND - BL_SIZE)
 #define PARTCODE  0x44
 #define SIG_BYTE3 0x02
@@ -146,7 +150,7 @@ static void process_input ( uint8_t c ) {
 
 }
 
-#include "led_v1_2.h";
+#include "led_v1_2.h"
 
 int main ( void ) {
   cli();