diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf
index 5b2a4a4e3..1c0dcce4f 100644
--- a/meta-digi-arm/conf/machine/ccardimx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardimx28js.conf
@@ -8,9 +8,13 @@ IMXBOOTLETS_MACHINE = "CCARDIMX28JS"
 
 KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb"
 
-# Use standard serial port name and let device handlers (mdev, udev)
-# create a symlink to the correct device.
-SERIAL_CONSOLES = "115200;ttyS0"
+# Configure the serial console for kernel 2.x and 3.x and let the
+# post-installation script drop the not-supported one on first boot
+SERIAL_CONSOLES ?= "115200;ttyAM0 115200;ttyAMA0"
+SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
+
+# Bluetooth tty
+BT_TTY ?= "${@base_conditional('IS_KERNEL_2X', '1' , 'ttySP0', 'ttyAPP0', d)}"
 
 # FLASH parameters
 MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047"
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 70d7a881e..4b9cf53ea 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -9,6 +9,9 @@ KERNEL_DEVICETREE = "imx6q-${MACHINE}.dtb"
 
 SERIAL_CONSOLES = "115200;ttymxc3"
 
+# Bluetooth tty
+BT_TTY ?= "ttymxc1"
+
 # U-Boot script to be copied to the SD image
 BOOT_SCRIPTS = "boot-sd.scr:boot.scr"
 
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 9588c7760..e260bcf31 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -39,7 +39,7 @@ MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual
 INHERIT += "fsl-dynamic-packagearch"
 
 # Extra udev rules
-MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
+MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-imx"
 
 # GStreamer 0.10 plugins
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf/10-imx.rules b/meta-digi-arm/recipes-core/udev/udev-extraconf/10-imx.rules
deleted file mode 100644
index f5856a21c..000000000
--- a/meta-digi-arm/recipes-core/udev/udev-extraconf/10-imx.rules
+++ /dev/null
@@ -1,33 +0,0 @@
-# Create symlinks for i.mx keypads and touchscreens
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxckpd",     SYMLINK+="input/keyboard0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxc_ts",     SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="imx_adc_ts", SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mpr084",     SYMLINK+="input/keyboard0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="tsc2007",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="STMP3XXX touchscreen",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="MXS touchscreen",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="HannStar P1003 Touchscreen",        SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="eGalax Touch Screen",       SYMLINK+="input/ts0"
-
-# The long class name gets cut off to be mc13783_connectiv in
-# /sys/class/mc13783_connectivity/mc13783_connectivit
-KERNEL=="mc13783_connectiv*",  NAME="mc13783_connectivity"
-# Anyone has readonly permission to IIM device file
-KERNEL=="mxc_iim",  MODE="0444", SYMLINK+="mxc_mem"
-KERNEL=="mxs_viim", MODE="0444", SYMLINK+="mxc_mem"
-KERNEL=="mxc_ipu",  MODE="0666"
-KERNEL=="fb0",      MODE="0666"
-KERNEL=="fb1",      MODE="0666"
-KERNEL=="fb2",      MODE="0666"
-KERNEL=="mxc_vpu",  MODE="0666"
-SUBSYSTEM=="video", MODE="0666"
-KERNEL=="gsl_kmod", MODE="0666"
-
-# MXS serial port rules
-KERNEL=="ttyAM0",   MODE="0660", SYMLINK+="ttyS0"
-KERNEL=="ttyAMA0",  MODE="0660", SYMLINK+="ttyS0"
-KERNEL=="ttySP0",   MODE="0660", SYMLINK+="ttyBt"
-KERNEL=="ttyAPP0",  MODE="0660", SYMLINK+="ttyBt"
-
-# i.MX6 serial port rules
-KERNEL=="ttymxc1",  MODE="0660", SYMLINK+="ttyBt"
diff --git a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
index 2ece1ca28..5cd9d5491 100644
--- a/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
+++ b/meta-digi-arm/recipes-core/udev/udev-extraconf_1.1.bbappend
@@ -6,4 +6,14 @@ SRC_URI += "file://mount_bootparts.sh"
 
 do_install_append() {
 	install -m 0755 ${WORKDIR}/mount_bootparts.sh ${D}${sysconfdir}/udev/scripts/
+
+	if [ -n "${BT_TTY}" ]; then
+		printf "%s\n%s\n" \
+		       "# Symlink to the bluetooth tty" \
+		       "KERNEL==\"${BT_TTY}\", MODE=\"0660\", GROUP=\"dialout\", SYMLINK+=\"ttyBt\"" \
+		       >> ${D}${sysconfdir}/udev/rules.d/localextra.rules
+	fi
 }
+
+# BT_TTY is machine specific (defined in machine config file)
+PACKAGE_ARCH = "${MACHINE_ARCH}"