diff --git a/examples/osd/.gitignore b/examples/osd/.gitignore
new file mode 100644
index 000000000..d21857f07
--- /dev/null
+++ b/examples/osd/.gitignore
@@ -0,0 +1,2 @@
+*.osd-merkur
+*.eep
diff --git a/examples/osd/6lowpan-tk/run.sh b/examples/osd/6lowpan-tk/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/6lowpan-tk/run.sh
+++ b/examples/osd/6lowpan-tk/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/climate/run.sh b/examples/osd/climate/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/climate/run.sh
+++ b/examples/osd/climate/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/dual-rgbw-actor/run.sh b/examples/osd/dual-rgbw-actor/run.sh
index b2cd87d5e..c65c87c3a 100755
--- a/examples/osd/dual-rgbw-actor/run.sh
+++ b/examples/osd/dual-rgbw-actor/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 #make clean TARGET=osd-merkur
-make -j TARGET=osd-merkur
+make -j TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 #avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/embedd-vm-merkurboard/run.sh b/examples/osd/embedd-vm-merkurboard/run.sh
index c20cc4e5b..a634126e4 100755
--- a/examples/osd/embedd-vm-merkurboard/run.sh
+++ b/examples/osd/embedd-vm-merkurboard/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 embedd-vm-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.eep
diff --git a/examples/osd/er-rest-example-merkurboard/run.sh b/examples/osd/er-rest-example-merkurboard/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/er-rest-example-merkurboard/run.sh
+++ b/examples/osd/er-rest-example-merkurboard/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/er-rest-example-merkurboard/runclient.sh b/examples/osd/er-rest-example-merkurboard/runclient.sh
index 3503afa2b..70dcea0e5 100755
--- a/examples/osd/er-rest-example-merkurboard/runclient.sh
+++ b/examples/osd/er-rest-example-merkurboard/runclient.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep
diff --git a/examples/osd/light-actor/run.sh b/examples/osd/light-actor/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/light-actor/run.sh
+++ b/examples/osd/light-actor/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/light-shutter-control/run.sh b/examples/osd/light-shutter-control/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/light-shutter-control/run.sh
+++ b/examples/osd/light-shutter-control/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/merkurboard/run.sh b/examples/osd/merkurboard/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/merkurboard/run.sh
+++ b/examples/osd/merkurboard/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/merkurboard/runclient.sh b/examples/osd/merkurboard/runclient.sh
index 3503afa2b..70dcea0e5 100755
--- a/examples/osd/merkurboard/runclient.sh
+++ b/examples/osd/merkurboard/runclient.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep
diff --git a/examples/osd/pingtheplug/run.sh b/examples/osd/pingtheplug/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/pingtheplug/run.sh
+++ b/examples/osd/pingtheplug/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/pir-sensor/run.sh b/examples/osd/pir-sensor/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/pir-sensor/run.sh
+++ b/examples/osd/pir-sensor/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/powerbox/run.sh b/examples/osd/powerbox/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/powerbox/run.sh
+++ b/examples/osd/powerbox/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/rpl-border-router/run.sh b/examples/osd/rpl-border-router/run.sh
index 098192f57..2bcaa03ef 100755
--- a/examples/osd/rpl-border-router/run.sh
+++ b/examples/osd/rpl-border-router/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur
 avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep
diff --git a/examples/osd/servo-sensor/run.sh b/examples/osd/servo-sensor/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/servo-sensor/run.sh
+++ b/examples/osd/servo-sensor/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/examples/osd/slip-radio/run.sh b/examples/osd/slip-radio/run.sh
index 056794e5d..94e36daac 100755
--- a/examples/osd/slip-radio/run.sh
+++ b/examples/osd/slip-radio/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size slip-radio.osd-merkur
 avr-objcopy -j .text -j .data -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.eep
diff --git a/examples/osd/wirelessplug/run.sh b/examples/osd/wirelessplug/run.sh
index 4f21e9b63..2efd2cf48 100755
--- a/examples/osd/wirelessplug/run.sh
+++ b/examples/osd/wirelessplug/run.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+# For the new bootloader (using a jump-table) you want to use
+# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
 make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
 avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
 avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
 avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
diff --git a/platform/osd-merkur/Makefile.osd-merkur b/platform/osd-merkur/Makefile.osd-merkur
index 32f882127..01d2db10d 100644
--- a/platform/osd-merkur/Makefile.osd-merkur
+++ b/platform/osd-merkur/Makefile.osd-merkur
@@ -50,7 +50,14 @@ AVRDUDE_MCU=m128rfa1
 # CFLAGS  += -save-temps
 # Bootloader bonsai
 # LDFLAGS  += -save-temps
-LDFLAGS  += -Wl,--defsym,bootloader_get_mac=0x0001f3a0
+# For the old bonsai bootloader compiled with squeeze gcc-avr we
+# directly used the address of the bootloader:
+#BOOTLOADER_GET_MAC=0x0001f3a0
+# For newer bonsai we have a jump table at the end of the bootloader
+# section:
+BOOTLOADER_GET_MAC=0x0001ff80
+
+LDFLAGS  += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
 
 
 include $(CONTIKIAVR)/Makefile.avr