diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index cad96b3b2a..5dbf2cb8de 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -64,7 +64,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "linux-nokia900"
 
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
@@ -76,4 +76,4 @@ module_autoload_g_ether = "g_ether"
 # Copied from include/omap3.inc (as we do not use linux-omap recipes):
 #
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r54"
+MACHINE_KERNEL_PR = "r55"