diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index 79e6f9ee8b..6bbacab0a8 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -28,15 +28,17 @@
this software.
*/
-/*
- USB Printer host demo application.
-
- ** NOT CURRENTLY FUNCTIONAL - DO NOT USE **
-*/
+/** \file
+ *
+ * Main source file for the PrinterHost demo. This file contains the main tasks of
+ * the demo and is responsible for the initial application hardware configuration.
+ */
#include "PrinterHost.h"
-
+/** Main program entry point. This routine configures the hardware required by the application, then
+ * starts the scheduler to run the application tasks.
+ */
int main(void)
{
SetupHardware();
diff --git a/Demos/Host/LowLevel/PrinterHost/makefile b/Demos/Host/LowLevel/PrinterHost/makefile
index ab2eaab236..a56d9f2a82 100644
--- a/Demos/Host/LowLevel/PrinterHost/makefile
+++ b/Demos/Host/LowLevel/PrinterHost/makefile
@@ -60,7 +60,7 @@
# MCU name
-MCU = at90usb647
+MCU = at90usb1287
# Target board (see library "Board Types" documentation, USER or blank for projects not requiring
diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile
index 82661fffca..d118a25c85 100644
--- a/Demos/Host/LowLevel/makefile
+++ b/Demos/Host/LowLevel/makefile
@@ -32,6 +32,9 @@ all:
make -C MouseHostWithParser clean
make -C MouseHostWithParser all
+ make -C PrinterHost clean
+ make -C PrinterHost all
+
make -C StillImageHost clean
make -C StillImageHost all
@@ -43,4 +46,5 @@ all:
make -C MassStorageHost $@
make -C MouseHost $@
make -C MouseHostWithParser $@
+ make -C PrinterHost $@
make -C StillImageHost $@
diff --git a/LUFA.pnproj b/LUFA.pnproj
index e6bc099bfe..2e725a7910 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/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index d7c47e4cd1..0c51940edc 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -28,6 +28,7 @@
* - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions
* - Added new USE_FLASH_DESCRIPTORS and TOTAL_NUM_CONFIGURATIONS compile time options
* - Added support for the new ATMEGA32U2, ATMEGA16U2 and ATMEGA8U2 AVR models
+ * - Added new PrinterHost demo (thanks to John Andrews)
*
* Changed:
* - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)