diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 16102fb958..9506d29d34 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -7,6 +7,10 @@
  /** \page Page_ChangeLog Project Changelog
   *
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
+  *  <b>New:</b>
+  *  - Core:
+  *   - Added support for the Pololu A-Star Micro board (thanks to Joh Schneider)
+  *
   *  <b>Fixed:</b>
   *  - Core:
   *   - The CALLBACK_USB_GetDescriptor() callback function into the user application erroneously had a uint8_t type for the wIndex
diff --git a/LUFA/DoxygenPages/DeviceSupport.txt b/LUFA/DoxygenPages/DeviceSupport.txt
index 657739e297..cff2cda4b9 100644
--- a/LUFA/DoxygenPages/DeviceSupport.txt
+++ b/LUFA/DoxygenPages/DeviceSupport.txt
@@ -118,6 +118,7 @@
  *   - Olimex AVR-ISP-MK2
  *   - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
  *   - PJRC Teensy (1.x and 2.x versions)
+ *   - Pololu A-Star Micro
  *   - Rikus' U2S
  *   - Sparkfun U2 Breakout Board
  *   - Stange ISP Programmer Board
diff --git a/LUFA/Drivers/Board/Board.h b/LUFA/Drivers/Board/Board.h
index 44e755d7e1..03662b96ef 100644
--- a/LUFA/Drivers/Board/Board.h
+++ b/LUFA/Drivers/Board/Board.h
@@ -157,6 +157,8 @@
 			#include "AVR8/YUN/Board.h"
 		#elif (BOARD == BOARD_MICRO)
 			#include "AVR8/MICRO/Board.h"
+		#elif (BOARD == BOARD_POLOLUMICRO)
+			#include "AVR8/POLOLUMICRO/Board.h"
 		#elif (BOARD == BOARD_XPLAINED_MINI)
 			#include "AVR8/XPLAINED_MINI/Board.h"
 		#else
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 6f3bf15f01..6c2c29139b 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -93,8 +93,9 @@
 
 		#if (BOARD == BOARD_NONE)
 			#define BUTTONS_BUTTON1  0
-			static inline void       Buttons_Init(void) {};
-			static inline uint_reg_t Buttons_GetStatus(void) { return 0; };
+			static inline void       Buttons_Init(void) {}
+			static inline void       Buttons_Disable(void) {}
+			static inline uint_reg_t Buttons_GetStatus(void) { return 0; }
 		#elif (BOARD == BOARD_USBKEY)
 			#include "AVR8/USBKEY/Buttons.h"
 		#elif (BOARD == BOARD_STK525)
diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index 1260cbe1f4..e1e0f29410 100644
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -105,8 +105,9 @@
 			#define JOY_LEFT         0
 			#define JOY_RIGHT        0
 			#define JOY_PRESS        0
-			static inline void       Joystick_Init(void) {};
-			static inline uint_reg_t Joystick_GetStatus(void) { return 0; };
+			static inline void       Joystick_Init(void) {}
+			static inline void       Joystick_Disable(void) {}
+			static inline uint_reg_t Joystick_GetStatus(void) { return 0; }
 		#elif (BOARD == BOARD_USBKEY)
 			#include "AVR8/USBKEY/Joystick.h"
 		#elif (BOARD == BOARD_STK525)
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index de1e5a6331..811c7749de 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -108,13 +108,13 @@
 		#include "../../Common/Common.h"
 
 		#if (BOARD == BOARD_NONE)
-			static inline void LEDs_Init(void) {};
-			static inline void LEDs_Disable(void) {};
-			static inline void LEDs_TurnOnLEDs(const uint_reg_t LEDMask) {};
-			static inline void LEDs_TurnOffLEDs(const uint_reg_t LEDMask) {};
-			static inline void LEDs_SetAllLEDs(const uint_reg_t LEDMask) {};
-			static inline void LEDs_ChangeLEDs(const uint_reg_t LEDMask, const uint_reg_t ActiveMask) {};
-			static inline void LEDs_ToggleLEDs(const uint_reg_t LEDMask) {};
+			static inline void       LEDs_Init(void) {}
+			static inline void       LEDs_Disable(void) {}
+			static inline void       LEDs_TurnOnLEDs(const uint_reg_t LEDMask) {}
+			static inline void       LEDs_TurnOffLEDs(const uint_reg_t LEDMask) {}
+			static inline void       LEDs_SetAllLEDs(const uint_reg_t LEDMask) {}
+			static inline void       LEDs_ChangeLEDs(const uint_reg_t LEDMask, const uint_reg_t ActiveMask) {}
+			static inline void       LEDs_ToggleLEDs(const uint_reg_t LEDMask) {}
 			static inline uint_reg_t LEDs_GetLEDs(void) { return 0; }
 		#elif (BOARD == BOARD_USBKEY)
 			#include "AVR8/USBKEY/LEDs.h"
@@ -207,6 +207,8 @@
 			#include "AVR8/YUN/LEDs.h"
 		#elif (BOARD == BOARD_MICRO)
 			#include "AVR8/MICRO/LEDs.h"
+		#elif (BOARD == BOARD_POLOLUMICRO)
+			#include "AVR8/POLOLUMICRO/LEDs.h"
 		#elif (BOARD == BOARD_XPLAINED_MINI)
 			#include "AVR8/XPLAINED_MINI/LEDs.h"
 		#else