diff --git a/Bootloaders/CDC/asf.xml b/Bootloaders/CDC/asf.xml
index 6f0fa643c50..bddbcffc283 100644
--- a/Bootloaders/CDC/asf.xml
+++ b/Bootloaders/CDC/asf.xml
@@ -9,8 +9,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1F000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1F000"/>
@@ -33,8 +33,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0xF000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0xF000"/>
@@ -57,8 +57,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x7000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x7000"/>
@@ -81,8 +81,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x3000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x3000"/>
@@ -105,8 +105,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1000"/>
diff --git a/Bootloaders/DFU/asf.xml b/Bootloaders/DFU/asf.xml
index 746dca72f5f..0a547c336f4 100644
--- a/Bootloaders/DFU/asf.xml
+++ b/Bootloaders/DFU/asf.xml
@@ -9,8 +9,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1F000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1F000"/>
@@ -33,8 +33,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0xF000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0xF000"/>
@@ -57,8 +57,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x7000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x7000"/>
@@ -79,8 +79,8 @@
 		<device-support value="atmega16u2"/>
 		<config name="lufa.drivers.board.name" value="none"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x3000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x3000"/>
@@ -101,8 +101,8 @@
 		<device-support value="atmega8u2"/>
 		<config name="lufa.drivers.board.name" value="none"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1000"/>
diff --git a/Bootloaders/HID/asf.xml b/Bootloaders/HID/asf.xml
index 793b3e55d39..91fb35ebfaa 100644
--- a/Bootloaders/HID/asf.xml
+++ b/Bootloaders/HID/asf.xml
@@ -9,8 +9,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1F000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1F000"/>
@@ -26,8 +26,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0xF000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0xF000"/>
@@ -43,8 +43,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x7000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x7000"/>
@@ -60,8 +60,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x3800"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x3800"/>
@@ -77,8 +77,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1800"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1800"/>
diff --git a/Bootloaders/MassStorage/asf.xml b/Bootloaders/MassStorage/asf.xml
index 07a6f800780..11633dc5a68 100644
--- a/Bootloaders/MassStorage/asf.xml
+++ b/Bootloaders/MassStorage/asf.xml
@@ -9,8 +9,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1E000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1E000"/>
@@ -35,8 +35,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0xE000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0xE000"/>
@@ -61,8 +61,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x7000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x7000"/>
@@ -90,8 +90,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x3000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x3000"/>
diff --git a/Bootloaders/Printer/asf.xml b/Bootloaders/Printer/asf.xml
index 5773bf6ea28..b7621ac1bac 100644
--- a/Bootloaders/Printer/asf.xml
+++ b/Bootloaders/Printer/asf.xml
@@ -9,8 +9,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1F000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1F000"/>
@@ -33,8 +33,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0xF000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0xF000"/>
@@ -57,8 +57,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x7000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x7000"/>
@@ -81,8 +81,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x3000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x3000"/>
@@ -105,8 +105,8 @@
 
 		<config name="config.compiler.optimization.level" value="size"/>
 
-		<build type="define" name="F_CPU" value="8000000UL"/>
-		<build type="define" name="F_USB" value="8000000UL"/>
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
 
 		<build type="define" name="BOOT_START_ADDR" value="0x1000"/>
 		<build type="linker-config" subtype="flags" value="--section-start=.text=0x1000"/>