diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
index 2e8658b66b..995246b94f 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
@@ -32,13 +32,14 @@ STM32_VDD 330U
 I2C_ORDER I2C1
 
 # order of UARTs (and USB), USART3 should be in second place to map order with the board's silk screen
-UART_ORDER OTG1 USART3 USART1 USART2 UART4 UART7
+UART_ORDER OTG1 USART3 USART1 USART2 UART4 UART7 USART6
 
 # buzzer
-PD15 BUZZER OUTPUT GPIO(80) LOW
-define HAL_BUZZER_PIN 80
-define HAL_BUZZER_ON 1
-define HAL_BUZZER_OFF 0
+PD15 TIM4_CH4 TIM4 GPIO(77) ALARM
+#PD15 BUZZER OUTPUT GPIO(80) LOW
+#define HAL_BUZZER_PIN 80
+#define HAL_BUZZER_ON 1
+#define HAL_BUZZER_OFF 0
 
 # PA10 IO-debug-console
 PA11 OTG_FS_DM OTG1
@@ -77,7 +78,7 @@ define HAL_BATT_VOLT_PIN 13
 define HAL_BATT_CURR_PIN 12
 define HAL_BATT_VOLT_SCALE 10.1
 define HAL_BATT_CURR_SCALE 17.0
- 
+
 PC5 RSSI_ADC ADC1
 
 PA2 LED0 OUTPUT LOW
@@ -98,20 +99,21 @@ PB10 USART3_TX USART3
 PA0 UART4_TX UART4 NODMA
 PA1 UART4_RX UART4 NODMA
 
-# UART6, RX only, for RCIN
+# USART6, RX only for RCIN
 PC7 TIM8_CH2 TIM8 RCININT FLOAT LOW
+PC6 USART6_TX USART6 NODMA LOW
 
 # UART7 USED BY ESC FROM ORIGINAL DESIGN
 PE7 UART7_RX UART7
 PE8 UART7_TX UART7
 
 # Motors
-PB0  TIM3_CH3 TIM3 PWM(4) GPIO(53)
 PB1  TIM1_CH3N TIM1 PWM(1) GPIO(50)
 PE9  TIM1_CH1 TIM1 PWM(2) GPIO(51)
 PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52)
-PA3  TIM5_CH4 TIM5 PWM(6) GPIO(55)
+PB0  TIM3_CH3 TIM3 PWM(4) GPIO(53)
 PC9  TIM3_CH4 TIM3 PWM(5) GPIO(54)
+PA3  TIM5_CH4 TIM5 PWM(6) GPIO(55)
 
 DMA_PRIORITY S*