diff --git a/conf/machine/at91sam9m10g45ek.conf b/conf/machine/at91sam9m10g45ek.conf
index 979d58a..ac54fc3 100644
--- a/conf/machine/at91sam9m10g45ek.conf
+++ b/conf/machine/at91sam9m10g45ek.conf
@@ -17,7 +17,7 @@ UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
 #UBOOT_MACHINE = "at91sam9m10g45ek_config"
 #UBOOT_MACHINE = "at91sam9m10g45ek_sd_config"
 
-AT91BOOTSTRAP_BOARD = "at91sam9g45df at91sam9g45ek at91sam9g45nf"
+AT91BOOTSTRAP_BOARD = "at91sam9m10df at91sam9m10ek at91sam9m10nf"
 
 MACHINE_FEATURES += "usbhost"
 
diff --git a/conf/machine/include/at91-2.6.30.inc b/conf/machine/include/at91-2.6.30.inc
index e245b15..0549a89 100644
--- a/conf/machine/include/at91-2.6.30.inc
+++ b/conf/machine/include/at91-2.6.30.inc
@@ -7,8 +7,8 @@ SOC_FAMILY = "at91"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.30"
 
-PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
-PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_3.0"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
 PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
 PREFERRED_VERSION_u-boot = "2009.11"
diff --git a/conf/machine/include/at91-2.6.32.inc b/conf/machine/include/at91-2.6.32.inc
index f315af3..4edfc82 100644
--- a/conf/machine/include/at91-2.6.32.inc
+++ b/conf/machine/include/at91-2.6.32.inc
@@ -7,8 +7,8 @@ SOC_FAMILY = "at91"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.32"
 
-PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
-PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_3.0"
+PREFERRED_VERSION_at91bootstrap = "3.0"
 
 PREFERRED_PROVIDER_u-boot = "u-boot_2009.11"
 PREFERRED_VERSION_u-boot = "2009.11"