diff --git a/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb b/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb
deleted file mode 100644
index 99bc6899f..000000000
--- a/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2012 Digi International
-PR = "${INC_PR}.0"
-
-include recipes-kernel/linux/linux-imx.inc
-
-COMPATIBLE_MACHINE = "(mxs|mx5)"
-
-SRCREV_mxs = "agonzal/yocto"
-LOCALVERSION_mxs = "-mxs+agonzal_yocto"
-
-
-SRCREV_mx5 = "agonzal/yocto"
-LOCALVERSION_mx5 = "-mx5x+agonzal_yocto"
-
-SRC_URI = "git://log-sln-git.digi.com/linux-2.6.git \
-           file://defconfig \
-"
-
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
new file mode 100644
index 000000000..7742dce7b
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
@@ -0,0 +1,10 @@
+# Copyright (C) 2012 Digi International
+PR_append = "+digi.0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}_${PV}"
+SRC_URI = "git://log-sln-git.digi.com/linux-2.6.git;tag=agonzal/yocto \
+           file://defconfig \
+"
+
+LOCALVERSION_mx5 = "mx5+agonzal_yocto"
+LOCALVERSION_mxs = "mxs+agonzal_yocto"
diff --git a/meta-digi-arm/recipes-kernel/linux/ccardxmx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig
similarity index 100%
rename from meta-digi-arm/recipes-kernel/linux/ccardxmx28js/defconfig
rename to meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig
diff --git a/meta-digi-arm/recipes-kernel/linux/ccxmx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig
similarity index 100%
rename from meta-digi-arm/recipes-kernel/linux/ccxmx51js/defconfig
rename to meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig
diff --git a/meta-digi-arm/recipes-kernel/linux/ccxmx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig
similarity index 100%
rename from meta-digi-arm/recipes-kernel/linux/ccxmx53js/defconfig
rename to meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig