diff --git a/README.md b/README.md
index 860fe4478..924129067 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,17 @@ online documentation.
 
 The current release supports the following hardware platforms:
 
+Software for the following hardware platforms is in beta support:
+
+* Digi ConnectCore 6UL
+  * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne)
+* Digi ConnectCore 6UL Starter Kit
+  * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm))
+* Digi ConnectCore 6UL Development Kit
+  * [Digi P/N CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001515/default.htm#concept/yocto/c_get_started_with_yocto.htm))
+
+Software for the following hardware platforms is in production support:
+
 * Digi ConnectCore 6
   * [Digi P/N CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn)
   * [Digi P/N CC-WMX-L96C-TE](http://www.digi.com/products/models/cc-wmx-l96c-te)
@@ -27,20 +38,13 @@ The current release supports the following hardware platforms:
   * Digi P/N CC-WMX-J98C-FJA
   * Digi P/N CC-WMX-J98C-FJA-1
 
-Software for the following hardware platforms is in beta support:
-
-* Digi ConnectCore 6UL
-  * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne)
-* Digi ConnectCore 6UL Starter Kit
-  * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm))
-
 * Digi ConnectCore 6 Development Kit
   * [Digi P/N CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](http://www.digi.com/resources/documentation/digidocs/90001945-13/default.htm#concept/yocto/c_get_started_with_yocto.htm%3FTocPath%3DDigi%2520Embedded%2520Yocto%7CGet%2520started%7C_____0))
 
 * Digi ConnectCore 6 SBC
   * [Digi P/N CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1)
-  * Digi P/N CC-SB-WMX-L87C-1
-  * Digi P/N CC-SB-WMX-L76C-1
+  * [Digi P/N CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1)
+  * [Digi P/N CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1)
 
 Previous versions of Digi Embedded Yocto include support for additional Digi
 hardware.
@@ -49,19 +53,33 @@ hardware.
 
 Documentation is available online on the Digi documentation site:
 
-* [Digi ConnectCore 6UL](http://www.digi.com/resources/documentation/Digidocs/90001514/default.htm)
-* [Digi ConnectCore 6](http://www.digi.com/resources/documentation/Digidocs/90001945-13/default.htm)
+* [Digi ConnectCore 6UL Starter Kit](http://www.digi.com/resources/documentation/Digidocs/90001514/default.htm)
+* [Digi ConnectCore 6UL Development Kit](http://www.digi.com/resources/documentation/Digidocs/90001515/default.htm)
+* [Digi ConnectCore 6 Jumpstart Development Kit](http://www.digi.com/resources/documentation/Digidocs/90001945-13/default.htm)
 
 # Downloads
 
-* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/images/
-* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/sdk/
+* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r4/images/
+* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r4/sdk/
 
 # Release Changelog
 
 ## 2.0-r4
 
-* TBC
+* Digi ConnectCore 6UL
+  * Support for Digi ConnectCore 6UL SBC
+    * Linux kernel v4.1.35
+    * Support for Fusion touch displays
+  * Authenticated and encrypted initramfs, bootscripts and DTBs
+  * Encrypted root filesystem
+  * MCA firmware update
+  * MCA tampering
+  * Power management optimizations
+* Digi ConnectCore 6
+  * Support for Quectel EC-20 LTE modem
+  * Authenticated and encrypted initramfs, bootscripts and DTBs
+  * Linux kernel v3.14.79
+  * Minor bug fixes
 
 ## 2.0-r3
 
@@ -111,6 +129,10 @@ properly. To work around this problem the UART is configured without hardware
 flow control at 115200 bps, reducing the maximum throughput of this interface.
 This problem will be corrected in newer revisions of the hardware.
 
+* U-Boot version dub-2015.04-r4.5 may report running on Starter Board version 1
+even when your Starter Board is version 2. In that case Ethernet does not work
+in U-Boot. More recent versions of U-Boot fix this issue.
+
 ## Digi ConnectCore 6
 
 * NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum
@@ -125,7 +147,6 @@ modes:
 softAP mode
 * A maximum of ten connected devices are supported when using Qualcomm's AR6233
 Bluetooth Low Energy mode
-* The MIPI and CSI1 camera connectors cannot be used simultaneously.
 
 ## Digi ConnectCore 6 SBC
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index e8aa9ce89..ffaaeec3a 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -21,6 +21,7 @@ MACHINE_FIRMWARE ?= ""
 
 MACHINE_EXTRA_RDEPENDS += " \
     imx-kobs \
+    mca-tool \
     mtd-utils-ubifs \
     u-boot-fw-utils \
 "
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 25e32c53e..59596c3c1 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -12,7 +12,6 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native',
 PROVIDES += "u-boot"
 
 SRCBRANCH = "v2015.04/master"
-SRCBRANCH_ccimx6ul = "v2015.04/master"
 SRCREV = "${AUTOREV}"
 
 # Select internal or Github U-Boot repo
diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.0.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.0.bb
index d3d92684c..0374451dc 100644
--- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.0.bb
+++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.0.bb
@@ -7,8 +7,8 @@ LICENSE = "CLOSED"
 PKGNAME = "mca_tool"
 SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "ea869665e49f5c964bfb4ebc08c0f123"
-SRC_URI[sha256sum] = "d0fecdeac90b94b4399418a2e64e44f4ac2786abf66aeed8d3dab953e74d1ae4"
+SRC_URI[md5sum] = "bee011ed0f1f2394c55bedaeda92f5cf"
+SRC_URI[sha256sum] = "d6983fb0941a8b8c63c7369ef7285190be19ef446fc2a206e25a2c545a1ea671"
 
 S = "${WORKDIR}/${PKGNAME}-${PV}"
 
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
index 98f8a7a01..b528613a3 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 SRCBRANCH = "v2015.04/master"
-SRCBRANCH_ccimx6ul = "v2015.04/master"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig
index 682517403..fba83f1be 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig
@@ -323,6 +323,7 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_MCA_CC6UL_ADC=y
+CONFIG_TAMPER_MCA_CC6UL=y
 CONFIG_PWM=y
 CONFIG_PWM_IMX=y
 # CONFIG_RESET_GPIO is not set
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6/trustfence-tool b/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6/trustfence-tool
new file mode 100755
index 000000000..79c9c2fac
Binary files /dev/null and b/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6/trustfence-tool differ
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6ul/trustfence-tool b/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6ul/trustfence-tool
new file mode 100755
index 000000000..763c67201
Binary files /dev/null and b/meta-digi-dey/recipes-core/trustfence/trustfence-tool-2.0/ccimx6ul/trustfence-tool differ
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.0.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.0.bb
index 30d7fdf99..885203ae6 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.0.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.0.bb
@@ -4,9 +4,19 @@ SUMMARY = "Trustfence command line tool"
 SECTION = "console/tools"
 LICENSE = "CLOSED"
 
-SRC_URI = "${DIGI_PKG_SRC}/${BP}.tar.gz"
+SRC_URI = "file://trustfence-tool"
 
-SRC_URI[md5sum] = "9556aec9c9b0ef7e38606040e4f059d0"
-SRC_URI[sha256sum] = "21f013616393883a5c3e0e9d7332e5d169af515f83b3a7dbf365e9ffbde1c593"
+S = "${WORKDIR}"
 
-inherit bin_package
+INSANE_SKIP_${PN} = "already-stripped"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install() {
+	install -d ${D}${base_sbindir}
+	install -m 0755 trustfence-tool ${D}${base_sbindir}
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul)"