diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index e596d3389c..e63f455df2 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -4,13 +4,16 @@ BR2_arm926t=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
-BR2_TARGET_UBOOT_2010_06=y
+BR2_TARGET_UBOOT_BOARDNAME="integratorcp_cm926ejs"
+
+# Lock down headers to avoid breaking with new defaults
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="2.6.35"
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_2_6_35=
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35"
 BR2_LINUX_KERNEL_DEFCONFIG="integrator"
 
 # Filesystem