diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/KakuteF7.jpg b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/KakuteF7.jpg
deleted file mode 100644
index c73fe7fac2..0000000000
Binary files a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/KakuteF7.jpg and /dev/null differ
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/README.md b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/README.md
index 5f6d1b105d..63e9b9ccb7 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/README.md
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/README.md
@@ -16,10 +16,22 @@ The KakuteF7 AIO is a flight controller produced by [Holybro](http://www.holybro
 
 ## Pinout
 
-![KakuteF7 Board](KakuteF7.jpg "KakuteF7")
+The KakuteF7 comes in two varients. One is an AIO (All-In-One) board,
+with OSD. The other is a smaller board without OSD.
+
+### KakuteF7 Pinout
+
+![KakuteF7 Board](kakutef7.jpg "KakuteF7")
+
+### KakuteF7 AIO Pinout
+
+![KakuteF7 AIO Board](kakutef7_AIO.jpg "KakuteF7 AIO")
 
 ## UART Mapping
 
+The UARTs are marked Rn and Tn in the above pinouts. The Rn pin is the
+receive pin for UARTn. The Tn pin is the transmit pin for UARTn.
+
  - SERIAL0 -> USB
  - SERIAL1 -> UART1 (Telem1)
  - SERIAL2 -> UART2 (Telem2)
@@ -41,7 +53,7 @@ FrSky Telemetry is supported using the T6 pin (UART6 transmit). You need to set
   
 ## OSD Support
 
-The KakuteF7 supports OSD using OSD_TYPE 1 (MAX7456 driver).
+The KakuteF7 AIO supports OSD using OSD_TYPE 1 (MAX7456 driver).
 
 ## PWM Output
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7.jpg b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7.jpg
new file mode 100644
index 0000000000..8a035fc3b0
Binary files /dev/null and b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7.jpg differ
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7_AIO.jpg b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7_AIO.jpg
new file mode 100644
index 0000000000..57977e9123
Binary files /dev/null and b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/kakutef7_AIO.jpg differ