diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index bc4d55977a..68180c221c 100644
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -31,23 +31,23 @@ makeboardlist:
 testboards:
 	@echo "buildtest:" > BuildMakefile
 	
-	@while read line; \
-	 do \
-	   build_cfg=`grep "$$line " BoardDeviceMap.cfg | sed 's/ //g' | grep -v "#" | cut -d'=' -f2-`; \
-	   \
-	   build_board=$$line; \
-	   build_arch=`echo $$build_cfg | cut -d':' -f1`; \
-	   build_mcu=`echo $$build_cfg | cut -d':' -f2`; \
-	   \
-	   if ( test -z "$$build_cfg" ); then \
-	     echo "No matching information set for board $$build_board"; \
-	   else \
+	@while read line;                                                         \
+	 do                                                                       \
+	   build_cfg=`grep "$$line " BoardDeviceMap.cfg | grep -v "#" | cut -d'=' -f2- | sed 's/ //g'`; \
+	                                                                          \
+	   build_board=$$line;                                                    \
+	   build_arch=`echo $$build_cfg | cut -d':' -f1`;                         \
+	   build_mcu=`echo $$build_cfg | cut -d':' -f2`;                          \
+	                                                                          \
+	   if ( test -z "$$build_cfg" ); then                                     \
+	     echo "No matching information set for board $$build_board";          \
+	   else                                                                   \
 	     echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \
-		 \
+		                                                                      \
 		 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \
 		 printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \
 		 printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s elf\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \
-	   fi; \
+	   fi;                                                                    \
 	 done < BoardList.txt
 	 
 	 $(MAKE) -f BuildMakefile buildtest
diff --git a/BuildTests/BoardDriverTest/makefile.avr8 b/BuildTests/BoardDriverTest/makefile.avr8
index 1f0d7596f5..eed8b305da 100644
--- a/BuildTests/BoardDriverTest/makefile.avr8
+++ b/BuildTests/BoardDriverTest/makefile.avr8
@@ -149,7 +149,7 @@ ASRC =
 # Optimization level, can be [0, 1, 2, 3, s].
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # Debugging format.
@@ -222,7 +222,7 @@ CFLAGS += -Wstrict-prototypes
 #CFLAGS += -Wundef
 #CFLAGS += -Wunreachable-code
 #CFLAGS += -Wsign-compare
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -249,7 +249,7 @@ CPPFLAGS += -Wundef
 #CPPFLAGS += -Wstrict-prototypes
 #CPPFLAGS += -Wunreachable-code
 #CPPFLAGS += -Wsign-compare
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -263,7 +263,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/BuildTests/BoardDriverTest/makefile.uc3 b/BuildTests/BoardDriverTest/makefile.uc3
index 7e75b5479d..8f307b1ee4 100644
--- a/BuildTests/BoardDriverTest/makefile.uc3
+++ b/BuildTests/BoardDriverTest/makefile.uc3
@@ -123,7 +123,7 @@ ASRC =
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -185,7 +185,7 @@ CFLAGS += -fno-strict-aliasing
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
 CFLAGS += -masm-addr-pseudos
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -208,7 +208,7 @@ CPPFLAGS += -fno-exceptions
 CPPFLAGS += -masm-addr-pseudos
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -222,7 +222,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Linker Options ----------------
diff --git a/BuildTests/BoardDriverTest/makefile.xmega b/BuildTests/BoardDriverTest/makefile.xmega
index 5a048b8e39..3c46efafdd 100644
--- a/BuildTests/BoardDriverTest/makefile.xmega
+++ b/BuildTests/BoardDriverTest/makefile.xmega
@@ -140,7 +140,7 @@ ASRC =
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -207,7 +207,7 @@ CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -231,7 +231,7 @@ CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -245,7 +245,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg b/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
index 8cb5d28dd8..8a023f55c5 100644
--- a/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
+++ b/BuildTests/BootloaderTest/BootloaderDeviceMap.cfg
@@ -2,42 +2,42 @@
 #
 # ------------ CDC Bootloader -------------
 CDC = avr8 : at90usb1287 : NONE : 128 : 8 :
-CDC = avr8 : at90usb647 : NONE : 64 : 4 :
+CDC = avr8 : at90usb647  : NONE :  64 : 4 :
 CDC = avr8 : at90usb1286 : NONE : 128 : 8 :
-CDC = avr8 : at90usb646 : NONE : 64 : 4 :
-CDC = avr8 : atmega32u4 : NONE : 32 : 4 :
-CDC = avr8 : atmega16u4 : NONE : 16 : 4 :
-CDC = avr8 : atmega32u2 : NONE : 32 : 4 :
-CDC = avr8 : atmega16u2 : NONE : 16 : 4 :
-CDC = avr8 : atmega8u2 : NONE : 8 : 4 :
-CDC = avr8 : at90usb162 : NONE : 16 : 4 :
-CDC = avr8 : at90usb82 : NONE : 8 : 4 :
+CDC = avr8 : at90usb646  : NONE :  64 : 4 :
+CDC = avr8 : atmega32u4  : NONE :  32 : 4 :
+CDC = avr8 : atmega16u4  : NONE :  16 : 4 :
+CDC = avr8 : atmega32u2  : NONE :  32 : 4 :
+CDC = avr8 : atmega16u2  : NONE :  16 : 4 :
+CDC = avr8 : atmega8u2   : NONE :   8 : 4 :
+CDC = avr8 : at90usb162  : NONE :  16 : 4 :
+CDC = avr8 : at90usb82   : NONE :   8 : 4 :
 #
 # ------------ DFU Bootloader -------------
 DFU = avr8 : at90usb1287 : NONE : 128 : 8 :
-DFU = avr8 : at90usb647 : NONE : 64 : 4 :
+DFU = avr8 : at90usb647  : NONE :  64 : 4 :
 DFU = avr8 : at90usb1286 : NONE : 128 : 8 :
-DFU = avr8 : at90usb646 : NONE : 64 : 4 :
-DFU = avr8 : atmega32u6 : NONE : 32 : 4 :
-DFU = avr8 : atmega32u4 : NONE : 32 : 4 :
-DFU = avr8 : atmega16u4 : NONE : 16 : 4 :
-DFU = avr8 : atmega32u2 : NONE : 32 : 4 :
-DFU = avr8 : atmega16u2 : NONE : 16 : 4 :
-DFU = avr8 : atmega8u2 : NONE : 8 : 4 :
-DFU = avr8 : at90usb162 : NONE : 16 : 4 :
-DFU = avr8 : at90usb82 : NONE : 8 : 4 :
+DFU = avr8 : at90usb646  : NONE :  64 : 4 :
+DFU = avr8 : atmega32u6  : NONE :  32 : 4 :
+DFU = avr8 : atmega32u4  : NONE :  32 : 4 :
+DFU = avr8 : atmega16u4  : NONE :  16 : 4 :
+DFU = avr8 : atmega32u2  : NONE :  32 : 4 :
+DFU = avr8 : atmega16u2  : NONE :  16 : 4 :
+DFU = avr8 : atmega8u2   : NONE :   8 : 4 :
+DFU = avr8 : at90usb162  : NONE :  16 : 4 :
+DFU = avr8 : at90usb82   : NONE :   8 : 4 :
 #
 # ------------ HID Bootloader -------------
 HID = avr8 : at90usb1287 : NONE : 128 : 4 :
-HID = avr8 : at90usb647 : NONE : 64 : 4 :
+HID = avr8 : at90usb647  : NONE :  64 : 4 :
 HID = avr8 : at90usb1286 : NONE : 128 : 4 :
-HID = avr8 : at90usb646 : NONE : 64 : 4 :
-HID = avr8 : atmega32u6 : NONE : 32 : 4 :
-HID = avr8 : atmega32u4 : NONE : 32 : 4 :
-HID = avr8 : atmega16u4 : NONE : 16 : 4 :
-HID = avr8 : atmega32u2 : NONE : 32 : 2 :
-HID = avr8 : atmega16u2 : NONE : 16 : 2 :
-HID = avr8 : atmega8u2 : NONE : 8 : 2 :
-HID = avr8 : at90usb162 : NONE : 16 : 2 :
-HID = avr8 : at90usb82 : NONE : 8 : 2 :
+HID = avr8 : at90usb646  : NONE :  64 : 4 :
+HID = avr8 : atmega32u6  : NONE :  32 : 4 :
+HID = avr8 : atmega32u4  : NONE :  32 : 4 :
+HID = avr8 : atmega16u4  : NONE :  16 : 4 :
+HID = avr8 : atmega32u2  : NONE :  32 : 2 :
+HID = avr8 : atmega16u2  : NONE :  16 : 2 :
+HID = avr8 : atmega8u2   : NONE :   8 : 2 :
+HID = avr8 : at90usb162  : NONE :  16 : 2 :
+HID = avr8 : at90usb82   : NONE :   8 : 2 :
 #
\ No newline at end of file
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 7ce56c49f0..5b378ec99f 100644
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -27,24 +27,26 @@ end:
 testbootloaders:
 	@echo "buildtest:" > BuildMakefile
 	
-	@while read line; \
-	 do \
-	   build_cfg=`echo $$line | sed 's/ //g' | grep -v "#"`; \
-	   \
-	   if ( test -n "$$build_cfg" ); then \
+	@while read line;                                         \
+	 do                                                       \
+	   build_cfg=`echo $$line | grep -v "#" | sed 's/ //g'`;  \
+	                                                          \
+	   if ( test -n "$$build_cfg" ); then                     \
 	     build_bootloader=`echo $$build_cfg | cut -d'=' -f1`; \
-	     build_arch=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f1`; \
-	     build_mcu=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f2`; \
-	     build_board=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f3`; \
-	     build_flashsize=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f4`; \
-	     build_bootsize=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f5`; \
-	     \
+		 build_cfg=`echo $$build_cfg | cut -d'=' -f2-`;       \
+		                                                      \
+	     build_arch=`echo $$build_cfg | cut -d':' -f1`;       \
+	     build_mcu=`echo $$build_cfg | cut -d':' -f2`;        \
+	     build_board=`echo $$build_cfg | cut -d':' -f3`;      \
+	     build_flashsize=`echo $$build_cfg | cut -d':' -f4`;  \
+	     build_bootsize=`echo $$build_cfg | cut -d':' -f5`;   \
+	                                                          \
 	     printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \
-	     \
+	                                                          \
 	     printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \
 	     printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean\n" $$build_bootloader >> BuildMakefile; \
 	     printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s elf\n\n" $$build_bootloader $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \
-	   fi; \
+	   fi;                                                    \
 	 done < BootloaderDeviceMap.cfg
 	 
 	 $(MAKE) -f BuildMakefile buildtest
diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8
index 360b1ee8bf..89f4e46266 100644
--- a/BuildTests/ModuleTest/makefile.avr8
+++ b/BuildTests/ModuleTest/makefile.avr8
@@ -154,7 +154,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s].
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # Debugging format.
@@ -220,7 +220,7 @@ CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -fno-split-wide-types
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 CFLAGS += -Werror
@@ -268,7 +268,7 @@ CPPFLAGS += -fshort-enums
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 
 
@@ -281,7 +281,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3
index 05b8d583bd..15945a5b19 100644
--- a/BuildTests/ModuleTest/makefile.uc3
+++ b/BuildTests/ModuleTest/makefile.uc3
@@ -126,7 +126,7 @@ ASRC = Dummy.S                 \
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -186,7 +186,7 @@ CFLAGS += -funsigned-bitfields
 CFLAGS += -ffunction-sections
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -masm-addr-pseudos
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 CFLAGS += -Werror
@@ -235,7 +235,7 @@ CPPFLAGS += -fno-exceptions
 CPPFLAGS += -masm-addr-pseudos
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -249,7 +249,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst)
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Linker Options ----------------
diff --git a/BuildTests/ModuleTest/makefile.xmega b/BuildTests/ModuleTest/makefile.xmega
index de27630dc9..75d0b3a8d8 100644
--- a/BuildTests/ModuleTest/makefile.xmega
+++ b/BuildTests/ModuleTest/makefile.xmega
@@ -143,7 +143,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -209,7 +209,7 @@ CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -fno-split-wide-types
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 CFLAGS += -Werror
@@ -259,7 +259,7 @@ CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -273,7 +273,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/BuildTests/SingleUSBModeTest/makefile.avr8 b/BuildTests/SingleUSBModeTest/makefile.avr8
index fc0f54b661..1f0e77e10e 100644
--- a/BuildTests/SingleUSBModeTest/makefile.avr8
+++ b/BuildTests/SingleUSBModeTest/makefile.avr8
@@ -150,7 +150,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s].
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # Debugging format.
@@ -223,7 +223,7 @@ CFLAGS += -Wstrict-prototypes
 #CFLAGS += -Wundef
 #CFLAGS += -Wunreachable-code
 #CFLAGS += -Wsign-compare
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -250,7 +250,7 @@ CPPFLAGS += -Wundef
 #CPPFLAGS += -Wstrict-prototypes
 #CPPFLAGS += -Wunreachable-code
 #CPPFLAGS += -Wsign-compare
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -264,7 +264,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/BuildTests/SingleUSBModeTest/makefile.uc3 b/BuildTests/SingleUSBModeTest/makefile.uc3
index 4bc729aed2..bcf883047e 100644
--- a/BuildTests/SingleUSBModeTest/makefile.uc3
+++ b/BuildTests/SingleUSBModeTest/makefile.uc3
@@ -124,7 +124,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -186,7 +186,7 @@ CFLAGS += -fno-strict-aliasing
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
 CFLAGS += -masm-addr-pseudos
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -209,7 +209,7 @@ CPPFLAGS += -fno-exceptions
 CPPFLAGS += -masm-addr-pseudos
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -223,7 +223,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Linker Options ----------------
diff --git a/BuildTests/SingleUSBModeTest/makefile.xmega b/BuildTests/SingleUSBModeTest/makefile.xmega
index e3ad8f401f..d2bf3778ed 100644
--- a/BuildTests/SingleUSBModeTest/makefile.xmega
+++ b/BuildTests/SingleUSBModeTest/makefile.xmega
@@ -141,7 +141,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s]. 
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
+OPT = 1
 
 
 # List any extra directories to look for include files here.
@@ -208,7 +208,7 @@ CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -232,7 +232,7 @@ CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -246,7 +246,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Library Options ----------------
diff --git a/LUFA/CodeTemplates/makefile_template.uc3 b/LUFA/CodeTemplates/makefile_template.uc3
index 982576064a..a73e7d46bf 100644
--- a/LUFA/CodeTemplates/makefile_template.uc3
+++ b/LUFA/CodeTemplates/makefile_template.uc3
@@ -188,7 +188,7 @@ CFLAGS += -fno-strict-aliasing
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
 CFLAGS += -masm-addr-pseudos
-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 CFLAGS += $(CSTANDARD)
 
@@ -211,7 +211,7 @@ CPPFLAGS += -fno-exceptions
 CPPFLAGS += -masm-addr-pseudos
 CPPFLAGS += -Wall
 CPPFLAGS += -Wundef
-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #CPPFLAGS += $(CSTANDARD)
 
@@ -225,7 +225,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]
 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
 #       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
+ASFLAGS = $(ADEFS)
+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
 
 #---------------- Linker Options ----------------