diff --git a/uart.c b/uart.c
index aa928c8..539623c 100644
--- a/uart.c
+++ b/uart.c
@@ -8,8 +8,14 @@ FILE uart_output = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WRITE);
 void uart_init()
 {
     DDRD |= 1 << 1; // TX
-    UART_BAUD_REGH  = (BAUDRATE>>8);
-    UART_BAUD_REGL  = BAUDRATE;               // set baud rate
+    UART_BAUD_REGH  = UBRRH_VALUE;//(BAUDRATE>>8);
+    UART_BAUD_REGL  = UBRRL_VALUE;//BAUDRATE;               // set baud rate
+
+#if USE_2X
+    UART_CTRL_REGA |= (1 << USE_2X);
+#else
+    UART_CTRL_REGA &= ~(1 << USE_2X);
+#endif
 
     UART_CTRL_REGB |= (1<<UART_TXEN_BM)
                      //|(1<<UART_RXEN_BM)
diff --git a/uart.h b/uart.h
index 257cea6..4231234 100644
--- a/uart.h
+++ b/uart.h
@@ -1,9 +1,11 @@
 #ifndef _UART_H_
 #define _UART_H_
 
+#define BAUD 115200
+
 #include <stdio.h>
+#include <util/setbaud.h>
 
-#define BAUD 9600 
 #define BAUDRATE ((F_CPU)/(BAUD*16UL)-1)
 
 #define UART_BAUD_REGH UBRR0H