diff --git a/LUFA.pnproj b/LUFA.pnproj
index 1d20f10237..313360439b 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index 50c397d63d..e1988e7b9e 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -98,9 +98,12 @@
/** Selects the Teensy (all versions) specific board drivers, including the driver for the board LEDs. */
#define BOARD_TEENSY 11
- /** Selects the USBTINY MKII specific board drivers, , including the driver for the board LEDs. */
+ /** Selects the USBTINY MKII specific board drivers, including the driver for the board LEDs. */
#define BOARD_USBTINYMKII 12
+ /** Selects the Benito specific board drivers, including the driver for the board LEDs. */
+ #define BOARD_BENITO 13
+
#if !defined(__DOXYGEN__)
#define BOARD_ BOARD_NONE
diff --git a/Projects/Benito/Board/LEDs.h b/LUFA/Drivers/Board/BENITO/LEDs.h
similarity index 78%
rename from Projects/Benito/Board/LEDs.h
rename to LUFA/Drivers/Board/BENITO/LEDs.h
index 0b09a2c07a..9139d92671 100644
--- a/Projects/Benito/Board/LEDs.h
+++ b/LUFA/Drivers/Board/BENITO/LEDs.h
@@ -28,9 +28,25 @@
this software.
*/
-/*
- Board LEDs driver for the Benito board, from www.dorkbotpdx.org.
-*/
+/** \file
+ * \brief Board specific LED driver header for the Benito.
+ *
+ * Board specific LED driver header for the Benito (http://dorkbotpdx.org/wiki/benito).
+ *
+ * \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ * dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ */
+
+/** \ingroup Group_LEDs
+ * @defgroup Group_LEDs_BENITO BENITO
+ *
+ * Board specific LED driver header for the Benito (http://dorkbotpdx.org/wiki/benito).
+ *
+ * \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ * dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ *
+ * @{
+ */
#ifndef __LEDS_BENITO_H__
#define __LEDS_BENITO_H__
@@ -108,3 +124,5 @@
#endif
#endif
+
+/** @} */
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 9d470a700e..884aa7dab3 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -53,7 +53,8 @@
* provides an interface to configure, test and change the status of all the board LEDs.
*
* If the BOARD value is set to BOARD_USER, this will include the /Board/Dataflash.h file in the user project
- * directory. Otherwise, it will include the appropriate built in board driver header file.
+ * directory. Otherwise, it will include the appropriate built in board driver header file. If the BOARD value
+ * is set to BOARD_NONE, this driver is silently disabled.
*
* \note To make code as compatible as possible, it is assumed that all boards carry a minimum of four LEDs. If
* a board contains less than four LEDs, the remaining LED masks are defined to 0 so as to have no effect.
@@ -106,6 +107,8 @@
#include "TEENSY/LEDs.h"
#elif (BOARD == BOARD_USBTINYMKII)
#include "USBTINYMKII/LEDs.h"
+ #elif (BOARD == BOARD_BENITO)
+ #include "BENITO/LEDs.h"
#elif (BOARD == BOARD_USER)
#include "Board/LEDs.h"
#endif
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 53268882e1..0dd0497616 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -13,6 +13,7 @@
* - Added board hardware driver support for the PJRC Teensy line of USB AVR boards
* - Added new Relay Controller Board project (thanks to OBinou)
* - Added board hardware driver support for Tom's USBTINY MKII programmer
+ * - Added board hardware driver support for the Benito programmer
*
* Changed:
* - AVRISP programmer project now has a more robust timeout system, allowing for an increase of the software USART speed
diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile
index 8b9d126a97..2f735540a1 100644
--- a/Projects/Benito/makefile
+++ b/Projects/Benito/makefile
@@ -66,7 +66,7 @@ MCU = atmega32u2
# Target board (see library "Board Types" documentation, NONE for projects not requiring
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory.
-BOARD = USER
+BOARD = BENITO
# Processor frequency.