diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index cd0315d8c4..53a83ddad9 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -29,8 +29,8 @@ LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAG
 FLASH_SIZE_KB         = 128
 BOOT_SECTION_SIZE_KB  = 8
 
-# Bootloader address calculation formulas (requires the "bc" unix utility)
-# Do not modify these macros, but rather modify the depedant values above.
+# Bootloader address calculation formulas
+# Do not modify these macros, but rather modify the dependent values above.
 CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )
 BOOT_START_OFFSET     = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )
 BOOT_SEC_OFFSET       = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - $(strip $(1)) )
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 9b26784e07..950e8b6577 100644
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -29,8 +29,8 @@ LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAG
 FLASH_SIZE_KB         = 128
 BOOT_SECTION_SIZE_KB  = 8
 
-# Bootloader address calculation formulas (requires the "bc" unix utility)
-# Do not modify these macros, but rather modify the depedant values above.
+# Bootloader address calculation formulas
+# Do not modify these macros, but rather modify the dependent values above.
 CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )
 BOOT_START_OFFSET     = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )
 BOOT_SEC_OFFSET       = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - $(strip $(1)) )
@@ -44,7 +44,7 @@ BOOT_API_LD_FLAGS    += $(call BOOT_SECTION_LD_FLAG, signatures,  Signatures,  8
 
 # Default target
 all:
-	
+
 # Include LUFA build script makefiles
 include $(LUFA_PATH)/Build/lufa_core.mk
 include $(LUFA_PATH)/Build/lufa_sources.mk
diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile
index 7476ec1e88..dc7d179ca2 100644
--- a/Bootloaders/HID/makefile
+++ b/Bootloaders/HID/makefile
@@ -29,8 +29,8 @@ LD_FLAGS     = -Wl,--section-start=.text=$(BOOT_START_OFFSET)
 FLASH_SIZE_KB        := 128
 BOOT_SECTION_SIZE_KB := 8
 
-# Bootloader address calculation formulas (requires the "bc" unix utility)
-# Do not modify these macros, but rather modify the depedant values above.
+# Bootloader address calculation formulas
+# Do not modify these macros, but rather modify the dependent values above.
 CALC_ADDRESS_IN_HEX   = $(shell printf "0x%X" $$(( $(1) )) )
 BOOT_START_OFFSET     = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 )
 BOOT_SEC_OFFSET       = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - $(strip $(1)) )
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
index 2c49a33510..76f3d0a114 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
@@ -27,7 +27,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/Joystick/asf.xml b/Demos/Device/ClassDriver/Joystick/asf.xml
index 68b23d09ad..0d7bc1969b 100644
--- a/Demos/Device/ClassDriver/Joystick/asf.xml
+++ b/Demos/Device/ClassDriver/Joystick/asf.xml
@@ -25,7 +25,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/Keyboard/asf.xml b/Demos/Device/ClassDriver/Keyboard/asf.xml
index b77c0264da..759149c02a 100644
--- a/Demos/Device/ClassDriver/Keyboard/asf.xml
+++ b/Demos/Device/ClassDriver/Keyboard/asf.xml
@@ -25,7 +25,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/asf.xml b/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
index c802b547af..3f882bdc47 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
+++ b/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
@@ -25,7 +25,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/MIDI/asf.xml b/Demos/Device/ClassDriver/MIDI/asf.xml
index d3343843d1..632c5822d0 100644
--- a/Demos/Device/ClassDriver/MIDI/asf.xml
+++ b/Demos/Device/ClassDriver/MIDI/asf.xml
@@ -25,7 +25,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/Mouse/asf.xml b/Demos/Device/ClassDriver/Mouse/asf.xml
index ba444751b2..a0066643dd 100644
--- a/Demos/Device/ClassDriver/Mouse/asf.xml
+++ b/Demos/Device/ClassDriver/Mouse/asf.xml
@@ -25,7 +25,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerial/asf.xml b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
index 4d6277a6b2..0212db1672 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
@@ -27,7 +27,6 @@
 		<build type="header-file" value="Descriptors.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
-		<build type="header-file" value="Config/AppConfig.h"/>
 		<build type="header-file" value="Config/LUFAConfig.h"/>
 
 		<require idref="lufa.common"/>
diff --git a/Demos/Device/LowLevel/AudioInput/asf.xml b/Demos/Device/LowLevel/AudioInput/asf.xml
new file mode 100644
index 0000000000..af8c9c2600
--- /dev/null
+++ b/Demos/Device/LowLevel/AudioInput/asf.xml
@@ -0,0 +1,39 @@
+<asf xmlversion="1.0">
+	<project caption="Audio Input Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.audio_input.example">
+		<require idref="lufa.demos.device.lowlevel.audio_input"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.audio_input" caption="Audio Input Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Audio 1.0 Input device demo, implementing a basic USB microphone.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="AudioInput.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="AudioInput.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.adc"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/AudioOutput/asf.xml b/Demos/Device/LowLevel/AudioOutput/asf.xml
new file mode 100644
index 0000000000..50c26ad442
--- /dev/null
+++ b/Demos/Device/LowLevel/AudioOutput/asf.xml
@@ -0,0 +1,37 @@
+<asf xmlversion="1.0">
+	<project caption="Audio Output Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.audio_output.example">
+		<require idref="lufa.demos.device.lowlevel.audio_output"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.audio_output" caption="Audio Output Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Audio 1.0 Output device demo, implementing a basic USB speaker.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="AudioOutput.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="AudioOutput.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/asf.xml b/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
new file mode 100644
index 0000000000..b848280e90
--- /dev/null
+++ b/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Dual Virtual Serial Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.dual_cdc.example">
+		<require idref="lufa.demos.device.lowlevel.dual_cdc"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.dual_cdc" caption="Dual Virtual Serial Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Dual Virtual Serial (CDC) demo, implementing a pair of virtual serial port interfaces.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="LUFA DualVirtualSerial.inf"/>
+
+		<build type="c-source" value="DualVirtualSerial.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="DualVirtualSerial.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/GenericHID/asf.xml b/Demos/Device/LowLevel/GenericHID/asf.xml
new file mode 100644
index 0000000000..9470d44cfa
--- /dev/null
+++ b/Demos/Device/LowLevel/GenericHID/asf.xml
@@ -0,0 +1,36 @@
+<asf xmlversion="1.0">
+	<project caption="Generic HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.generic_hid.example">
+		<require idref="lufa.demos.device.lowlevel.generic_hid"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.generic_hid" caption="Generic HID Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Generic HID device demo, implementing a device whose LEDs can be controlled via HID messages from the host.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="GenericHID.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="GenericHID.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/Joystick/asf.xml b/Demos/Device/LowLevel/Joystick/asf.xml
new file mode 100644
index 0000000000..f695dd98c9
--- /dev/null
+++ b/Demos/Device/LowLevel/Joystick/asf.xml
@@ -0,0 +1,36 @@
+<asf xmlversion="1.0">
+	<project caption="Joystick HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.joystick.example">
+		<require idref="lufa.demos.device.lowlevel.joystick"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.joystick" caption="Joystick HID Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Joystick HID device demo, implementing a basic USB joystick that can send movement information to the host.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="Joystick.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="Joystick.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/Keyboard/asf.xml b/Demos/Device/LowLevel/Keyboard/asf.xml
new file mode 100644
index 0000000000..3b89b868bd
--- /dev/null
+++ b/Demos/Device/LowLevel/Keyboard/asf.xml
@@ -0,0 +1,37 @@
+<asf xmlversion="1.0">
+	<project caption="Keyboard HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.keyboard.example">
+		<require idref="lufa.demos.device.lowlevel.keyboard"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.keyboard" caption="Keyboard HID Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Keyboard HID device demo, implementing a basic USB keyboard that can send key press information to the host.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="Keyboard.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="Keyboard.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.joystick"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/KeyboardMouse/asf.xml b/Demos/Device/LowLevel/KeyboardMouse/asf.xml
new file mode 100644
index 0000000000..4ff2fb8bf9
--- /dev/null
+++ b/Demos/Device/LowLevel/KeyboardMouse/asf.xml
@@ -0,0 +1,37 @@
+<asf xmlversion="1.0">
+	<project caption="Keyboard and Mouse HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.keyboard_mouse.example">
+		<require idref="lufa.demos.device.lowlevel.keyboard_mouse"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.keyboard_mouse" caption="Keyboard and Mouse HID Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Keyboard and Mouse HID device demo, implementing a basic USB keyboard and mouse using a pair of HID interfaces.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="KeyboardMouse.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="KeyboardMouse.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.joystick"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/MIDI/asf.xml b/Demos/Device/LowLevel/MIDI/asf.xml
new file mode 100644
index 0000000000..e70fd4eeb0
--- /dev/null
+++ b/Demos/Device/LowLevel/MIDI/asf.xml
@@ -0,0 +1,37 @@
+<asf xmlversion="1.0">
+	<project caption="MIDI Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.midi.example">
+		<require idref="lufa.demos.device.lowlevel.midi"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.midi" caption="MIDI Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		MIDI device demo, implementing a basic USB MIDI device that can send messages to the host.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MIDI.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="MIDI.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/MassStorage/asf.xml b/Demos/Device/LowLevel/MassStorage/asf.xml
new file mode 100644
index 0000000000..689d00a99d
--- /dev/null
+++ b/Demos/Device/LowLevel/MassStorage/asf.xml
@@ -0,0 +1,41 @@
+<asf xmlversion="1.0">
+	<project caption="Mass Storage Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.mass_storage.example">
+		<require idref="lufa.demos.device.lowlevel.mass_storage"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.mass_storage" caption="Mass Storage Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Mass Storage device demo, implementing a basic USB storage disk using a Dataflash memory IC.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MassStorage.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="c-source" value="Lib/DataflashManager.c"/>
+		<build type="c-source" value="Lib/SCSI.c"/>
+		<build type="header-file" value="MassStorage.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+		<build type="header-file" value="Lib/DataflashManager.h"/>
+		<build type="header-file" value="Lib/SCSI.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.dataflash"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/Mouse/asf.xml b/Demos/Device/LowLevel/Mouse/asf.xml
new file mode 100644
index 0000000000..65f27f9e25
--- /dev/null
+++ b/Demos/Device/LowLevel/Mouse/asf.xml
@@ -0,0 +1,37 @@
+<asf xmlversion="1.0">
+	<project caption="Mouse HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.mouse.example">
+		<require idref="lufa.demos.device.lowlevel.mouse"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.mouse" caption="Mouse HID Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Mouse device demo, implementing a basic USB mouse device that can send movement information to the host.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="Mouse.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="Mouse.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/RNDISEthernet/asf.xml b/Demos/Device/LowLevel/RNDISEthernet/asf.xml
new file mode 100644
index 0000000000..c14fe00d3d
--- /dev/null
+++ b/Demos/Device/LowLevel/RNDISEthernet/asf.xml
@@ -0,0 +1,57 @@
+<asf xmlversion="1.0">
+	<project caption="RNDIS Ethernet Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.rndis.example">
+		<require idref="lufa.demos.device.lowlevel.rndis"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.rndis" caption="RNDIS Ethernet Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Microsoft RNDIS Ethernet networking device demo, implementing a basic HTTP webserver.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="RNDISEthernet.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="c-source" value="Lib/ARP.c"/>
+		<build type="c-source" value="Lib/DHCP.c"/>
+		<build type="c-source" value="Lib/Ethernet.c"/>
+		<build type="c-source" value="Lib/ICMP.c"/>
+		<build type="c-source" value="Lib/IP.c"/>
+		<build type="c-source" value="Lib/ProtocolDecoders.c"/>
+		<build type="c-source" value="Lib/TCP.c"/>
+		<build type="c-source" value="Lib/UDP.c"/>
+		<build type="c-source" value="Lib/Webserver.c"/>
+		<build type="header-file" value="RNDISEthernet.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+		<build type="header-file" value="Lib/ARP.h"/>
+		<build type="header-file" value="Lib/DHCP.h"/>
+		<build type="header-file" value="Lib/Ethernet.h"/>
+		<build type="header-file" value="Lib/ICMP.h"/>
+		<build type="header-file" value="Lib/IP.h"/>
+		<build type="header-file" value="Lib/ProtocolDecoders.h"/>
+		<build type="header-file" value="Lib/TCP.h"/>
+		<build type="header-file" value="Lib/UDP.h"/>
+		<build type="header-file" value="Lib/Webserver.h"/>
+		<build type="header-file" value="Lib/EthernetProtocols.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+	</module>
+</asf>
diff --git a/Demos/Device/LowLevel/VirtualSerial/asf.xml b/Demos/Device/LowLevel/VirtualSerial/asf.xml
new file mode 100644
index 0000000000..122716ef8c
--- /dev/null
+++ b/Demos/Device/LowLevel/VirtualSerial/asf.xml
@@ -0,0 +1,39 @@
+<asf xmlversion="1.0">
+	<project caption="Virtual Serial CDC Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.cdc.example">
+		<require idref="lufa.demos.device.lowlevel.cdc"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.lowlevel.cdc" caption="Virtual Serial CDC Device Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Virtual Serial device demo, implementing a virtual serial channel between the host PC and the device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="LUFA VirtualSerial.inf"/>
+
+		<build type="c-source" value="VirtualSerial.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="VirtualSerial.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Host/ClassDriver/AudioOutputHost/asf.xml b/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
index 4e7cc50a59..66276597bb 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
+++ b/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
@@ -19,8 +19,8 @@
 		<device-support-alias value="lufa_xmega"/>
 		<device-support-alias value="lufa_uc3"/>
 
-		<build type="c-source" value="AudioInputHost.c"/>
-		<build type="header-file" value="AudioInputHost.h"/>
+		<build type="c-source" value="AudioOutputHost.c"/>
+		<build type="header-file" value="AudioOutputHost.h"/>
 
 		<build type="module-config" subtype="path" value="Config"/>
 		<build type="header-file" value="Config/AppConfig.h"/>
diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml b/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
new file mode 100644
index 0000000000..669632a336
--- /dev/null
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
@@ -0,0 +1,43 @@
+<asf xmlversion="1.0">
+	<project caption="Android Accessory Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.android.example">
+		<require idref="lufa.demos.host.lowlevel.android"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.android" caption="Android Accessory Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Android Accessory Host demo, implementing a basic USB device whose LEDs can be controlled via an Android device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="AndroidAccessoryHost.c"/>
+		<build type="c-source" value="DeviceDescriptor.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="AndroidAccessoryHost.h"/>
+		<build type="header-file" value="DeviceDescriptor.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="c-source" value="Lib/AndroidAccessoryCommands.c"/>
+		<build type="header-file" value="Lib/AndroidAccessoryCommands.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/AudioInputHost/asf.xml b/Demos/Host/LowLevel/AudioInputHost/asf.xml
new file mode 100644
index 0000000000..8f4c484d92
--- /dev/null
+++ b/Demos/Host/LowLevel/AudioInputHost/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Audio Input Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.audio_input.example">
+		<require idref="lufa.demos.host.lowlevel.audio_input"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.audio_input" caption="Audio Input Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Audio Input Host demo, implementing a basic USB audio sink that can output incoming audio data to a speaker.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="AudioInputHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="AudioInputHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/AudioOutputHost/asf.xml b/Demos/Host/LowLevel/AudioOutputHost/asf.xml
new file mode 100644
index 0000000000..2c0592e51a
--- /dev/null
+++ b/Demos/Host/LowLevel/AudioOutputHost/asf.xml
@@ -0,0 +1,41 @@
+<asf xmlversion="1.0">
+	<project caption="Audio Output Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.audio_output.example">
+		<require idref="lufa.demos.host.lowlevel.audio_output"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.audio_output" caption="Audio Output Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Audio Output Host demo, implementing a basic USB audio source that can output audio data to an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="AudioOutputHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="AudioOutputHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.peripheral.adc"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/GenericHIDHost/asf.xml b/Demos/Host/LowLevel/GenericHIDHost/asf.xml
new file mode 100644
index 0000000000..4c545b919d
--- /dev/null
+++ b/Demos/Host/LowLevel/GenericHIDHost/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Generic HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.generic_hid.example">
+		<require idref="lufa.demos.host.lowlevel.generic_hid"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.generic_hid" caption="Generic HID Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Generic HID Host demo, implementing a basic USB HID device that can send and receive data to and from an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="GenericHIDHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="GenericHIDHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml b/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
new file mode 100644
index 0000000000..acd3020066
--- /dev/null
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
@@ -0,0 +1,40 @@
+<asf xmlversion="1.0">
+	<project caption="Joystick HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.joystick_parser.example">
+		<require idref="lufa.demos.host.lowlevel.joystick_parser"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.joystick_parser" caption="Joystick HID (with parser) Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Joystick HID Host demo with HID parser, implementing a basic USB joystick host that can display movement data on the board LEDs.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="JoystickHostWithParser.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="c-source" value="HIDReport.c"/>
+		<build type="header-file" value="JoystickHostWithParser.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+		<build type="header-file" value="HIDReport.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/KeyboardHost/asf.xml b/Demos/Host/LowLevel/KeyboardHost/asf.xml
new file mode 100644
index 0000000000..ab8a66b3f6
--- /dev/null
+++ b/Demos/Host/LowLevel/KeyboardHost/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Keyboard HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.keyboard.example">
+		<require idref="lufa.demos.host.lowlevel.keyboard"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.keyboard" caption="Keyboard HID Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Keyboard HID Host demo, implementing a basic USB keyboard host that can display key press data on the board LEDs.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="KeyboardHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="KeyboardHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml b/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
new file mode 100644
index 0000000000..1092a58fdd
--- /dev/null
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
@@ -0,0 +1,40 @@
+<asf xmlversion="1.0">
+	<project caption="Keyboard HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.keyboard_parser.example">
+		<require idref="lufa.demos.host.lowlevel.keyboard_parser"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.keyboard_parser" caption="Keyboard HID (with parser) Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Keyboard HID Host demo with HID parser, implementing a basic USB keyboard host that can display key press data on the board LEDs.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="KeyboardHostWithParser.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="c-source" value="HIDReport.c"/>
+		<build type="header-file" value="KeyboardHostWithParser.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+		<build type="header-file" value="HIDReport.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/MIDIHost/asf.xml b/Demos/Host/LowLevel/MIDIHost/asf.xml
new file mode 100644
index 0000000000..d3a982b63d
--- /dev/null
+++ b/Demos/Host/LowLevel/MIDIHost/asf.xml
@@ -0,0 +1,40 @@
+<asf xmlversion="1.0">
+	<project caption="MIDI Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.midi.example">
+		<require idref="lufa.demos.host.lowlevel.midi"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.midi" caption="MIDI Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		MIDI Host demo, capable of sending and receiving MIDI messages to and from an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MIDIHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="MIDIHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/MassStorageHost/asf.xml b/Demos/Host/LowLevel/MassStorageHost/asf.xml
new file mode 100644
index 0000000000..cb5e20ba53
--- /dev/null
+++ b/Demos/Host/LowLevel/MassStorageHost/asf.xml
@@ -0,0 +1,41 @@
+<asf xmlversion="1.0">
+	<project caption="Mass Storage Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.ms.example">
+		<require idref="lufa.demos.host.lowlevel.ms"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.ms" caption="Mass Storage Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Mass Storage Host demo, capable of reading and writing raw 512 byte segments to the device's serial port.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MassStorageHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="MassStorageHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="c-source" value="Lib/MassStoreCommands.c"/>
+		<build type="header-file" value="Lib/MassStoreCommands.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/MouseHost/asf.xml b/Demos/Host/LowLevel/MouseHost/asf.xml
new file mode 100644
index 0000000000..191a5f0e80
--- /dev/null
+++ b/Demos/Host/LowLevel/MouseHost/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Mouse HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.mouse.example">
+		<require idref="lufa.demos.host.lowlevel.mouse"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.mouse" caption="Mouse HID Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Keyboard HID Host demo, implementing a basic USB mouse host that can display movement data on the board LEDs.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MouseHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="MouseHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/asf.xml b/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
new file mode 100644
index 0000000000..579b382f3f
--- /dev/null
+++ b/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
@@ -0,0 +1,40 @@
+<asf xmlversion="1.0">
+	<project caption="Mouse HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.mouse_parser.example">
+		<require idref="lufa.demos.host.lowlevel.mouse_parser"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.mouse_parser" caption="Mouse HID (with parser) Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Mouse HID Host demo with HID parser, implementing a basic USB mouse host that can display movement data on the board LEDs.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="MouseHostWithParser.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="c-source" value="HIDReport.c"/>
+		<build type="header-file" value="MouseHostWithParser.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+		<build type="header-file" value="HIDReport.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/PrinterHost/asf.xml b/Demos/Host/LowLevel/PrinterHost/asf.xml
new file mode 100644
index 0000000000..70dbd3c8c2
--- /dev/null
+++ b/Demos/Host/LowLevel/PrinterHost/asf.xml
@@ -0,0 +1,41 @@
+<asf xmlversion="1.0">
+	<project caption="Printer Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.printer.example">
+		<require idref="lufa.demos.host.lowlevel.printer"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.printer" caption="Printer Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Printer Host demo, implementing a basic USB printer host that can send raw printer control data to an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="PrinterHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="PrinterHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="c-source" value="Lib/PrinterCommands.c"/>
+		<build type="header-file" value="Lib/PrinterCommands.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml b/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
new file mode 100644
index 0000000000..85a40f5b4b
--- /dev/null
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
@@ -0,0 +1,41 @@
+<asf xmlversion="1.0">
+	<project caption="RNDIS Ethernet Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.rndis.example">
+		<require idref="lufa.demos.host.lowlevel.rndis"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.rndis" caption="RNDIS Ethernet Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Microsoft RNDIS Ethernet Host demo, implementing a RNDIS host that can send and receive Ethernet data to and from an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="RNDISEthernetHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="RNDISEthernetHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="c-source" value="Lib/RNDISCommands.c"/>
+		<build type="header-file" value="Lib/RNDISCommands.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/StillImageHost/asf.xml b/Demos/Host/LowLevel/StillImageHost/asf.xml
new file mode 100644
index 0000000000..b18ab31e0e
--- /dev/null
+++ b/Demos/Host/LowLevel/StillImageHost/asf.xml
@@ -0,0 +1,42 @@
+<asf xmlversion="1.0">
+	<project caption="Still Image Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.si.example">
+		<require idref="lufa.demos.host.lowlevel.si"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.si" caption="Still Image Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Still Image Host demo, implementing a Still Image host that can send and receive PIMA data to and from an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="StillImageHost.c"/>
+		<build type="c-source" value="ConfigDescriptor.c"/>
+		<build type="header-file" value="StillImageHost.h"/>
+		<build type="header-file" value="ConfigDescriptor.h"/>
+
+		<build type="c-source" value="Lib/StillImageCommands.c"/>
+		<build type="header-file" value="Lib/StillImageCommands.h"/>
+		<build type="header-file" value="Lib/PIMACodes.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
new file mode 100644
index 0000000000..8a43be1289
--- /dev/null
+++ b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
@@ -0,0 +1,38 @@
+<asf xmlversion="1.0">
+	<project caption="Virtual Serial CDC Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.cdc.example">
+		<require idref="lufa.demos.host.lowlevel.cdc"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="usbkey"/>
+
+		<build type="define" name="F_CPU" value="8000000UL"/>
+		<build type="define" name="F_USB" value="8000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.host.lowlevel.cdc" caption="Virtual Serial CDC Host Demo (Low Level APIs)">
+		<info type="description" value="summary">
+		Virtual Serial Host demo, implementing a CDC host that can send and receive data to and from an attached device.
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="c-source" value="VirtualSerialHost.c"/>
+		<build type="c-source" value="ConfigDescriptors.c"/>
+		<build type="header-file" value="VirtualSerialHost.h"/>
+		<build type="header-file" value="ConfigDescriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.usart"/>
+		<require idref="lufa.drivers.misc.ansi"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/LUFA/StudioIntegration/generate_caches.py b/LUFA/StudioIntegration/generate_caches.py
index c76c0d8bb7..9c70ebdf1a 100644
--- a/LUFA/StudioIntegration/generate_caches.py
+++ b/LUFA/StudioIntegration/generate_caches.py
@@ -16,7 +16,7 @@ def main():
 		from asf_avrstudio5_interface import PythonFacade
 	except ImportError:
 		print "Fatal Error: The ASF project generator is missing."
-		sys.exit()
+		return 1
 
 	p = PythonFacade(os.path.abspath(__file__))
 
@@ -29,6 +29,7 @@ def main():
 	p.generate_extension_cache_files(sys.argv[1])
 
 	print "[Project Generator] Cache files created."
+	return 0
 
 
 if __name__ == "__main__":
diff --git a/Projects/TempDataLogger/asf.xml b/Projects/TempDataLogger/asf.xml
index cd0afd443f..8db5591872 100644
--- a/Projects/TempDataLogger/asf.xml
+++ b/Projects/TempDataLogger/asf.xml
@@ -34,6 +34,7 @@
 		<build type="c-source" value="Lib/DS1307.c"/>
 		<build type="header-file" value="Lib/DS1307.h"/>
 
+		<build type="include-path" value="Lib/FATFs/"/>
 		<build type="c-source" value="Lib/FATFs/ff.c"/>
 		<build type="header-file" value="Lib/FATFs/ff.h"/>
 		<build type="c-source" value="Lib/FATFs/diskio.c"/>
diff --git a/Projects/Webserver/asf.xml b/Projects/Webserver/asf.xml
index 4013a0ae08..121a9a3328 100644
--- a/Projects/Webserver/asf.xml
+++ b/Projects/Webserver/asf.xml
@@ -47,6 +47,7 @@
 		<build type="c-source" value="Lib/uIPManagement.c"/>
 		<build type="header-file" value="Lib/uIPManagement.h"/>
 
+		<build type="include-path" value="Lib/FATFs/"/>
 		<build type="c-source" value="Lib/FATFs/ff.c"/>
 		<build type="header-file" value="Lib/FATFs/ff.h"/>
 		<build type="c-source" value="Lib/FATFs/diskio.c"/>
@@ -54,6 +55,7 @@
 		<build type="header-file" value="Lib/FATFs/ffconf.h"/>
 		<build type="header-file" value="Lib/FATFs/integer.h"/>
 
+		<build type="include-path" value="Lib/uip/"/>
 		<build type="c-source" value="Lib/uip/clock.c"/>
 		<build type="header-file" value="Lib/uip/clock.h"/>
 		<build type="c-source" value="Lib/uip/timer.c"/>