diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index 2381d2a9e08..f25625b4f29 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -7,8 +7,53 @@
 /**
  *  \page Page_DeviceSupport Device and Hardware Support
  *
- *  \section Sec_AVR8_Support Atmel 32-Bit UC3 AVR (UC3)
- *  <i>The AVR32 UC3 device support is currently <b>experimental</b>, and is included for preview purposes only.</i>
+ *  \section Sec_AVR8_Support Atmel 8-Bit AVR (AVR8)
+ *
+ *  Currently supported AVR8 models:
+ *   - AT90USB82 (USB Device Only)
+ *   - ATMEGA8U2 (USB Device Only)
+ *   - AT90USB162 (USB Device Only)
+ *   - ATMEGA16U2 (USB Device Only)
+ *   - ATMEGA16U4 (USB Device Only)
+ *   - ATMEGA32U2 (USB Device Only)
+ *   - ATMEGA32U4 (USB Device Only)
+ *   - ATMEGA32U6 (USB Device Only)
+ *   - AT90USB646 (USB Device Only)
+ *   - AT90USB647 (USB Host and Device)
+ *   - AT90USB1286 (USB Device Only)
+ *   - AT90USB1287 (USB Host and Device)
+ *
+ *  Currently supported Atmel AVR8 boards (see \ref Group_BoardTypes):
+ *   - AT90USBKEY
+ *   - ATAVRUSBRF01
+ *   - EVK527
+ *   - RZUSBSTICK
+ *   - STK525
+ *   - STK526
+ *   - XPLAIN (Excluding the blue XPLAINED family boards)
+ *
+ *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile BOARD constant names):
+ *   - Adafruit U4 Breakout Board
+ *   - Arduino Uno
+ *   - Busware BUI
+ *   - Busware CUL V3
+ *   - Fletchtronics Bumble-B (using officially recommended peripheral layout)
+ *   - Kernel Concepts USBFOO
+ *   - Linnix UDIP
+ *   - MattairTech JM-DB-U2
+ *   - Maximus USB
+ *   - Microsin AVR-USB162
+ *   - Minimus USB
+ *   - Olimex AVR-USB-162
+ *   - PJRC Teensy (all revisions and versions)
+ *   - Sparkfun U2 Breakout Board
+ *   - TCNISO Blackcat USB JTAG
+ *   - Tempusdictum Benito
+ *   - Tom's USBTINY-MKII (all revisions and versions)
+ *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
+ *
+ *  \section Sec_AVR32_Support Atmel 32-Bit UC3 AVR (UC3)
+ *  Note: <i>The AVR32 UC3 device support is currently <b>experimental</b>, and is included for preview purposes only.</i>
  *
  *  Currently supported UC3 models:
  *   - AT32UC3A064 (USB Host and Device)
@@ -40,52 +85,10 @@
  *   - AT32UC3B0512 (USB Host and Device)
  *   - AT32UC3B1512 (USB Host and Device)
  *
- *  Currently supported Atmel boards (see \ref Group_BoardTypes):
+ *  Currently supported Atmel UC3 boards (see \ref Group_BoardTypes):
  *   - EVK1101
  *
- *  \section Sec_AVR8_Support Atmel 8-Bit AVR (AVR8)
- *
- *  Currently supported AVR8 models:
- *   - AT90USB82 (USB Device Only)
- *   - ATMEGA8U2 (USB Device Only)
- *   - AT90USB162 (USB Device Only)
- *   - ATMEGA16U2 (USB Device Only)
- *   - ATMEGA16U4 (USB Device Only)
- *   - ATMEGA32U2 (USB Device Only)
- *   - ATMEGA32U4 (USB Device Only)
- *   - ATMEGA32U6 (USB Device Only)
- *   - AT90USB646 (USB Device Only)
- *   - AT90USB647 (USB Host and Device)
- *   - AT90USB1286 (USB Device Only)
- *   - AT90USB1287 (USB Host and Device)
- *
- *  Currently supported Atmel boards (see \ref Group_BoardTypes):
- *   - AT90USBKEY
- *   - ATAVRUSBRF01
- *   - EVK527
- *   - RZUSBSTICK
- *   - STK525
- *   - STK526
- *   - XPLAIN (Both original first revision board, and newer boards with a different Dataflash model)
- *
  *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile BOARD constant names):
- *   - Adafruit U4 Breakout Board
- *   - Arduino Uno
- *   - Busware BUI
- *   - Busware CUL V3
- *   - Fletchtronics Bumble-B (using officially recommended peripheral layout)
- *   - Kernel Concepts USBFOO
- *   - Linnix UDIP
- *   - MattairTech JM-DB-U2
- *   - Maximus USB
- *   - Microsin AVR-USB162
- *   - Minimus USB
- *   - Olimex AVR-USB-162
- *   - PJRC Teensy (all revisions and versions)
- *   - Sparkfun U2 Breakout Board
- *   - TCNISO Blackcat USB JTAG
- *   - Tempusdictum Benito
- *   - Tom's USBTINY-MKII (all revisions and versions)
- *   - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
+ *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
  */