diff --git a/debian/changelog b/debian/changelog
index 7414bdae..deb52aaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 livecd-rootfs (2.525.30) UNRELEASED; urgency=medium
 
+  [ Robert C Jennings ]
   * ubuntu-cpc: Only produce explicitly specified artifacts (LP: #1837254)
 
- -- Robert C Jennings <robert.jennings@canonical.com>  Mon, 26 Aug 2019 16:30:32 -0500
+  [ Ethan Hsieh ]
+  * Add support for the Nitrogen6x board (LP: #1838064).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 10 Sep 2019 16:56:26 +0200
 
 livecd-rootfs (2.525.29) bionic; urgency=medium
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 43aa40d8..0bd786f8 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -187,6 +187,8 @@ case $IMAGEFORMAT in
 				MODEL=pi3 ;;
 			armhf+cm3)
 				MODEL=cm3 ;;
+			armhf+imx6)
+				MODEL=nitrogen6x ;;
 			*)
 				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
 				exit 1
@@ -860,6 +862,12 @@ case $ARCH in
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;
+			imx6)
+				COMPONENTS='main restricted universe multiverse'
+				KERNEL_FLAVOURS=generic
+				add_package install flash-kernel u-boot-tools wpasupplicant
+				BINARY_REMOVE_LINUX=false
+				;;
 
 		esac
 		;;