diff --git a/Bootloaders/CDC/BootloaderAPITable.S b/Bootloaders/CDC/BootloaderAPITable.S
index cad8f71f60cd69b809cdd3d5270ad533bf8d98df..a5d0b098ecf79fb15ebcb0662ad19b53aa930aad 100644
--- a/Bootloaders/CDC/BootloaderAPITable.S
+++ b/Bootloaders/CDC/BootloaderAPITable.S
@@ -1,32 +1,32 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
+;
+;             LUFA Library
+;     Copyright (C) Dean Camera, 2012.
+;
+;  dean [at] fourwalledcubicle [dot] com
+;           www.lufa-lib.org
+;
 
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
+;  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+;
+;  Permission to use, copy, modify, distribute, and sell this
+;  software and its documentation for any purpose is hereby granted
+;  without fee, provided that the above copyright notice appear in
+;  all copies and that both that the copyright notice and this
+;  permission notice and warranty disclaimer appear in supporting
+;  documentation, and that the name of the author not be used in
+;  advertising or publicity pertaining to distribution of the
+;  software without specific, written prior permission.
+;
+;  The author disclaim all warranties with regard to this
+;  software, including all implied warranties of merchantability
+;  and fitness.  In no event shall the author be liable for any
+;  special, indirect or consequential damages or any damages
+;  whatsoever resulting from loss of use, data or profits, whether
+;  in an action of contract, negligence or other tortious action,
+;  arising out of or in connection with the use or performance of
+;  this software.
 
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
 
 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
diff --git a/Bootloaders/DFU/BootloaderAPITable.S b/Bootloaders/DFU/BootloaderAPITable.S
index cad8f71f60cd69b809cdd3d5270ad533bf8d98df..a5d0b098ecf79fb15ebcb0662ad19b53aa930aad 100644
--- a/Bootloaders/DFU/BootloaderAPITable.S
+++ b/Bootloaders/DFU/BootloaderAPITable.S
@@ -1,32 +1,32 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
+;
+;             LUFA Library
+;     Copyright (C) Dean Camera, 2012.
+;
+;  dean [at] fourwalledcubicle [dot] com
+;           www.lufa-lib.org
+;
 
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
+;  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+;
+;  Permission to use, copy, modify, distribute, and sell this
+;  software and its documentation for any purpose is hereby granted
+;  without fee, provided that the above copyright notice appear in
+;  all copies and that both that the copyright notice and this
+;  permission notice and warranty disclaimer appear in supporting
+;  documentation, and that the name of the author not be used in
+;  advertising or publicity pertaining to distribution of the
+;  software without specific, written prior permission.
+;
+;  The author disclaim all warranties with regard to this
+;  software, including all implied warranties of merchantability
+;  and fitness.  In no event shall the author be liable for any
+;  special, indirect or consequential damages or any damages
+;  whatsoever resulting from loss of use, data or profits, whether
+;  in an action of contract, negligence or other tortious action,
+;  arising out of or in connection with the use or performance of
+;  this software.
 
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
 
 ; Trampolines to actual API implementations if the target address is outside the
 ; range of a rjmp instruction (can happen with large bootloader sections)
diff --git a/BuildTests/ModuleTest/Dummy.S b/BuildTests/ModuleTest/Dummy.S
index 659d144cb9858644100a250af817dae653113200..6b09e557e3666aa066141bcaf26dfb4b7a825def 100644
--- a/BuildTests/ModuleTest/Dummy.S
+++ b/BuildTests/ModuleTest/Dummy.S
@@ -1,32 +1,30 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2012.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
+;
+;             LUFA Library
+;     Copyright (C) Dean Camera, 2012.
+;
+;  dean [at] fourwalledcubicle [dot] com
+;           www.lufa-lib.org
+;
+
+;  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+;
+;  Permission to use, copy, modify, distribute, and sell this
+;  software and its documentation for any purpose is hereby granted
+;  without fee, provided that the above copyright notice appear in
+;  all copies and that both that the copyright notice and this
+;  permission notice and warranty disclaimer appear in supporting
+;  documentation, and that the name of the author not be used in
+;  advertising or publicity pertaining to distribution of the
+;  software without specific, written prior permission.
+;
+;  The author disclaim all warranties with regard to this
+;  software, including all implied warranties of merchantability
+;  and fitness.  In no event shall the author be liable for any
+;  special, indirect or consequential damages or any damages
+;  whatsoever resulting from loss of use, data or profits, whether
+;  in an action of contract, negligence or other tortious action,
+;  arising out of or in connection with the use or performance of
+;  this software.
 
 .section .text
 
diff --git a/BuildTests/SingleUSBModeTest/Dummy.S b/BuildTests/SingleUSBModeTest/Dummy.S
index 0a176358796d7fb6ffa9046c2f2d7316964a1471..026f9c45697e4469e562935fa502813b6082486e 100644
--- a/BuildTests/SingleUSBModeTest/Dummy.S
+++ b/BuildTests/SingleUSBModeTest/Dummy.S
@@ -1,32 +1,30 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2012.
+;
+;             LUFA Library
+;     Copyright (C) Dean Camera, 2012.
+;
+;  dean [at] fourwalledcubicle [dot] com
+;           www.lufa-lib.org
+;
 
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
+;  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+;
+;  Permission to use, copy, modify, distribute, and sell this
+;  software and its documentation for any purpose is hereby granted
+;  without fee, provided that the above copyright notice appear in
+;  all copies and that both that the copyright notice and this
+;  permission notice and warranty disclaimer appear in supporting
+;  documentation, and that the name of the author not be used in
+;  advertising or publicity pertaining to distribution of the
+;  software without specific, written prior permission.
+;
+;  The author disclaim all warranties with regard to this
+;  software, including all implied warranties of merchantability
+;  and fitness.  In no event shall the author be liable for any
+;  special, indirect or consequential damages or any damages
+;  whatsoever resulting from loss of use, data or profits, whether
+;  in an action of contract, negligence or other tortious action,
+;  arising out of or in connection with the use or performance of
+;  this software.
 
 .section .text
 
diff --git a/LUFA/Platform/UC3/Exception.S b/LUFA/Platform/UC3/Exception.S
index 50f52bdddba2d3a5a8b58f95adec79eab9915c4e..3bbea0e87300d4788ed5b5b2c3a6372511f840fe 100644
--- a/LUFA/Platform/UC3/Exception.S
+++ b/LUFA/Platform/UC3/Exception.S
@@ -1,32 +1,30 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
+;
+;             LUFA Library
+;     Copyright (C) Dean Camera, 2012.
+;
+;  dean [at] fourwalledcubicle [dot] com
+;           www.lufa-lib.org
+;
 
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
+;  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+;
+;  Permission to use, copy, modify, distribute, and sell this
+;  software and its documentation for any purpose is hereby granted
+;  without fee, provided that the above copyright notice appear in
+;  all copies and that both that the copyright notice and this
+;  permission notice and warranty disclaimer appear in supporting
+;  documentation, and that the name of the author not be used in
+;  advertising or publicity pertaining to distribution of the
+;  software without specific, written prior permission.
+;
+;  The author disclaim all warranties with regard to this
+;  software, including all implied warranties of merchantability
+;  and fitness.  In no event shall the author be liable for any
+;  special, indirect or consequential damages or any damages
+;  whatsoever resulting from loss of use, data or profits, whether
+;  in an action of contract, negligence or other tortious action,
+;  arising out of or in connection with the use or performance of
+;  this software.
 
 #if defined(__AVR32__)
 #include <avr32/io.h>