diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a65e3603..f9231199 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -8,6 +8,8 @@ require conf/machine/include/omap3.inc
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
+PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 99f0c80c..212ebe75 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -16,7 +16,7 @@ XSERVER = "xserver-xorg \
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r123"
+MACHINE_KERNEL_PR = "r124"
 
 KERNEL_IMAGETYPE = "uImage"