--- a/Makefile	Thu Jun 27 11:40:35 2013 +0800
+++ b/Makefile	Thu Jun 27 11:46:44 2013 +0800
@@ -28,6 +28,7 @@
 SOURCE    = main.c
 SOURCE += $(SOURCE_CRYPTO) $(SOURCE_SD)
 LIBS       = 
+BOOTLOADER_HEX = ATmegaBOOT_168_pihelp.hex
 
 OBJECTS := $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCE)))
 
@@ -100,6 +101,12 @@
 flash:	all
 	$(AVRDUDE) -U flash:w:main.hex:i
 
+combined.hex: main.hex $(BOOTLOADER_HEX)
+	srec_cat main.hex -I $(BOOTLOADER_HEX) -I -o $@ -I
+
+combo: combined.hex
+	$(AVRDUDE) -U flash:w:combined.hex:i
+
 checkprog:	
 	$(AVRDUDE) -v