diff --git a/mendel/Makefile b/mendel/Makefile
index f6c5c77..3808d03 100644
--- a/mendel/Makefile
+++ b/mendel/Makefile
@@ -63,8 +63,10 @@ all: $(PROGRAM).hex $(PROGRAM).lst size
 
 program: $(PROGRAM).hex
 	stty $(PROGBAUD) raw ignbrk hup < $(PROGPORT)
+	@sleep 0.1
+	@stty $(PROGBAUD) raw ignbrk hup < $(PROGPORT)
 	$(AVRDUDE) -cstk500v1 -b$(PROGBAUD) -p$(MCU_TARGET) -P$(PROGPORT) -C/etc/avrdude.conf -U flash:w:$^
-	stty 57600 raw ignbrk -hup -echo ixon < $(PROGPORT)
+	stty 115200 raw ignbrk -hup -echo ixon < $(PROGPORT)
 
 clean:
 	rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex *.al *.i *.s *~
@@ -73,16 +75,21 @@ size: $(PROGRAM).hex
 	@objdump -h mendel.elf | perl -ne '/.(data|text)\s+([0-9a-f]+)/ && do { $$a += eval "0x$$2" }; END { printf "%d bytes (%d%% of %dkb)\n", $$a, $$a * 100 / 16384, 16 }'
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) -Wa,-adhlns=$(<:.c=.al) -o $@ $^
+	@echo "  CC        $@"
+	@$(CC) -c $(CFLAGS) -Wa,-adhlns=$(<:.c=.al) -o $@ $^
 
 %.elf: $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@echo "  LINK      $@"
+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 %.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
+	@echo "  OBJDUMP   $@"
+	@$(OBJDUMP) -h -S $< > $@
 
 %.hex: %.elf
-	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+	@echo "  OBJCOPY   $@"
+	@$(OBJCOPY) -j .text -j .data -O ihex $< $@
 
 %.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
+	@echo "  OBJCOPY   $@"
+	@$(OBJCOPY) -j .text -j .data -O binary $< $@
diff --git a/mendel/serial.c b/mendel/serial.c
index c431bce..366e96e 100644
--- a/mendel/serial.c
+++ b/mendel/serial.c
@@ -4,7 +4,7 @@
 #include	"arduino.h"
 
 #define		BUFSIZE		64 + sizeof(ringbuffer)
-#define		BAUD		57600
+#define		BAUD		115200
 
 #define		ASCII_XOFF	19
 #define		ASCII_XON		17
@@ -26,11 +26,19 @@ void serial_init()
 	ringbuffer_init(rx_buffer, BUFSIZE);
 	ringbuffer_init(tx_buffer, BUFSIZE);
 
+#if BAUD > 38401
+	UCSR0A = MASK(U2X0);
+#else
 	UCSR0A = 0;
+#endif
 	UCSR0B = (1 << RXEN0) | (1 << TXEN0);
 	UCSR0C = (1 << UCSZ01) | (1 << UCSZ00);
 
-	UBRR0 = ((F_CPU / 16) / BAUD) - 1;
+#if BAUD > 38401
+	UBRR0 = (((F_CPU / 8) / BAUD) - 0.5);
+#else
+	UBRR0 = (((F_CPU / 16) / BAUD) - 0.5);
+#endif
 
 	UCSR0B |= (1 << RXCIE0) | (1 << UDRIE0);
 }