diff --git a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
index 7e0bedf0d13c6d79fa9bcf960a3784e5a1c886cd..0e3b7a0b370b10ac6eb6e9900135019efd308c0f 100644
--- a/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-2gb-v4.4.conf
@@ -150,6 +150,7 @@ repo_rcnee_pkg_list="	\
 	rcn-ee-archive-keyring	\
 	rcnee-access-point	\
 	tiomapconf	\
+	xserver-xorg-video-armada-etnaviv	\
 	xserver-xorg-video-omap	\
 "
 
diff --git a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
index 6497fae869b3a480571458e744d28731e1483735..55e3f1ff3e1a548a13f276b90eafee18c5ef7609 100644
--- a/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
+++ b/configs/bb.org-debian-jessie-lxqt-4gb-v4.4.conf
@@ -190,6 +190,7 @@ repo_rcnee_pkg_list="	\
 	tiomapconf	\
 	upm	\
 	vpdma-dra7xx-installer	\
+	xserver-xorg-video-armada-etnaviv	\
 	xserver-xorg-video-omap	\
 "
 
diff --git a/tools/hwpack/am57xx-beagle-x15.conf b/tools/hwpack/am57xx-beagle-x15.conf
index 8f6c53845e8f79c142b414b6401a5c59e05433e2..621f50dac5299bb4573167093f45e842b30c280c 100644
--- a/tools/hwpack/am57xx-beagle-x15.conf
+++ b/tools/hwpack/am57xx-beagle-x15.conf
@@ -29,5 +29,5 @@ conf_kernel="ti"
 usbnet_mem=
 dtb=
 SERIAL="ttyO2"
-drm="omapdrm"
+drm="etnaviv"
 drm_device_identifier="HDMI-A-1"
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index daa0814a3c587b03f6750c3460d50c99546601ef..bc5c0a06d88f4b1b3d7d77bf1b1a5bc32443c9d1 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1477,6 +1477,21 @@ populate_rootfs () {
 		fi
 	fi
 
+	if [ "x${drm}" = "xetnaviv" ] ; then
+		wfile="/etc/X11/xorg.conf"
+		if [ -f ${TEMPDIR}/disk${wfile} ] ; then
+			if [ -f ${TEMPDIR}/disk/usr/lib/xorg/modules/drivers/armada_drv.so ] then
+				sudo sed -i -e 's:modesetting:armada:g' ${TEMPDIR}/disk${wfile}
+				sudo sed -i -e 's:fbdev:armada:g' ${TEMPDIR}/disk${wfile}
+			else
+				sudo sed -i -e 's:modesetting:omap:g' ${TEMPDIR}/disk${wfile}
+				sudo sed -i -e 's:fbdev:omap:g' ${TEMPDIR}/disk${wfile}
+			fi
+			sudo sed -i -e 's:#HWcursor_false::g' ${TEMPDIR}/disk${wfile}
+			sudo sed -i -e 's:16:24:g' ${TEMPDIR}/disk${wfile}
+		fi
+	fi
+
 	if [ "${usbnet_mem}" ] ; then
 		echo "vm.min_free_kbytes = ${usbnet_mem}" >> ${TEMPDIR}/disk/etc/sysctl.conf
 	fi