diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index 0264e47be..eeb43bf1b 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -463,7 +463,7 @@ LDFLAGS += $(MATH_LIB)
 LDFLAGS += -lc -lgcc
 
 # Set linker-script name depending on selected submodel name
-LDFLAGS +=-T$(LINKERSCRIPTPATH)/link_stm32f10x_$(BOOT_MODEL).ld
+LDFLAGS +=-T$(LINKERSCRIPTPATH)/link_$(BOARD)_$(BOOT_MODEL).ld
 
 # ---------------------------------------------------------------------------
 # Options for OpenOCD flash-programming
diff --git a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h
index 4e51657e0..0b771e839 100644
--- a/flight/PiOS/Boards/STM32103CB_CC_Rev1.h
+++ b/flight/PiOS/Boards/STM32103CB_CC_Rev1.h
@@ -33,14 +33,10 @@
 /*
 Timer | Channel 1 | Channel 2 | Channel 3 | Channel 4
 ------+-----------+-----------+-----------+----------
-TIM1  |           |           |           |
-TIM2  | --------------- PIOS_DELAY -----------------
-TIM3  |           |           |           |
-TIM4  |           |           |           |
-TIM5  |           |           |           |
-TIM6  |           |           |           |
-TIM7  |           |           |           |
-TIM8  |           |           |           |
+TIM1  |  Servo 4  |           |           |
+TIM2  |  RC In 5  |  RC In 6  |  Servo 6  |  
+TIM3  |  Servo 5  |  RC In 2  |  RC In 3  |  RC In 4
+TIM4  |  RC In 1  |  Servo 3  |  Servo 2  |  Servo 1
 ------+-----------+-----------+-----------+----------
 */
 
@@ -322,5 +318,6 @@ TIM8  |           |           |           |
 #define PIOS_USB_DETECT_GPIO_PIN                GPIO_Pin_15
 #define PIOS_USB_DETECT_EXTI_LINE               EXTI_Line15
 #define PIOS_IRQ_USB_PRIORITY                   PIOS_IRQ_PRIO_MID
-
+#define PIOS_USB_RX_BUFFER_SIZE                 256
+#define PIOS_USB_TX_BUFFER_SIZE                 256
 #endif /* STM32103CB_AHRS_H_ */
diff --git a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h
index 8c2d05bb9..0edd5e0fb 100644
--- a/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h
+++ b/flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h
@@ -359,6 +359,8 @@ TIM8  |           |           |           |
 	#define PIOS_USB_DETECT_GPIO_PIN		GPIO_IN_2_PIN
 	#define PIOS_USB_DETECT_EXTI_LINE		EXTI_Line4
 	#define PIOS_IRQ_USB_PRIORITY			8
+        #define PIOS_USB_RX_BUFFER_SIZE                 512
+        #define PIOS_USB_TX_BUFFER_SIZE                 512
 #endif
 
 // *****************************************************************
diff --git a/flight/PiOS/Boards/STM3210E_OP.h b/flight/PiOS/Boards/STM3210E_OP.h
index 1675d7bee..b4710df7e 100644
--- a/flight/PiOS/Boards/STM3210E_OP.h
+++ b/flight/PiOS/Boards/STM3210E_OP.h
@@ -393,6 +393,8 @@ TIM8  | Servo 5   | Servo 6   | Servo 7   | Servo 8
 #define PIOS_USB_DETECT_GPIO_PIN                GPIO_Pin_4
 #define PIOS_USB_DETECT_EXTI_LINE               EXTI_Line4
 #define PIOS_IRQ_USB_PRIORITY                   PIOS_IRQ_PRIO_MID
+#define PIOS_USB_RX_BUFFER_SIZE                 512
+#define PIOS_USB_TX_BUFFER_SIZE                 512
 
 /**
  * glue macros for file IO
diff --git a/flight/PiOS/STM32F10x/pios_usb_hid.c b/flight/PiOS/STM32F10x/pios_usb_hid.c
index 5fb49900a..80b6cf6e5 100644
--- a/flight/PiOS/STM32F10x/pios_usb_hid.c
+++ b/flight/PiOS/STM32F10x/pios_usb_hid.c
@@ -59,10 +59,10 @@ static uint8_t transfer_possible = 0;
 static uint8_t rx_packet_buffer[PIOS_USB_HID_DATA_LENGTH + 2] = { 0 };
 static uint8_t tx_packet_buffer[PIOS_USB_HID_DATA_LENGTH + 2] = { 0 };
 
-uint8_t rx_pios_fifo_buf[1024] __attribute__ ((aligned(4)));    // align to 32-bit to try and provide speed improvement
+uint8_t rx_pios_fifo_buf[PIOS_USB_RX_BUFFER_SIZE] __attribute__ ((aligned(4)));    // align to 32-bit to try and provide speed improvement
 t_fifo_buffer rx_pios_fifo_buffer;
 
-uint8_t tx_pios_fifo_buf[1024] __attribute__ ((aligned(4)));    // align to 32-bit to try and provide speed improvement
+uint8_t tx_pios_fifo_buf[PIOS_USB_TX_BUFFER_SIZE] __attribute__ ((aligned(4)));    // align to 32-bit to try and provide speed improvement
 t_fifo_buffer tx_pios_fifo_buffer;
 
 #if defined(USE_FREERTOS)