diff --git a/aports/device/device-motorola-peregrine/APKBUILD b/aports/device/device-motorola-peregrine/APKBUILD
index 883d5771..3c3962a3 100644
--- a/aports/device/device-motorola-peregrine/APKBUILD
+++ b/aports/device/device-motorola-peregrine/APKBUILD
@@ -2,15 +2,15 @@
 pkgname="device-motorola-peregrine"
 pkgdesc="Moto G 4G (2013)"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
 depends="postmarketos-base linux-motorola-peregrine mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware device-motorola-peregrine-x11"
+source="deviceinfo xorg.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,10 +20,21 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="
+		libinput
+		xf86-input-libinput
+		xf86-video-fbdev"
+	install -Dm644 "$srcdir"/xorg.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-peregrine.conf
+}
+
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-motorola-titan"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="572091b996d55ce7f6a1b10b67cbd55677a251b4fdba209b6085d4cc00db411df35926fecf22c2dc62bca3c7472118643ed0956b479aa97a469d75f4b410feb7  deviceinfo"
+sha512sums="572091b996d55ce7f6a1b10b67cbd55677a251b4fdba209b6085d4cc00db411df35926fecf22c2dc62bca3c7472118643ed0956b479aa97a469d75f4b410feb7  deviceinfo
+f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf"
diff --git a/aports/device/device-motorola-peregrine/xorg.conf b/aports/device/device-motorola-peregrine/xorg.conf
new file mode 100644
index 00000000..b7374dc4
--- /dev/null
+++ b/aports/device/device-motorola-peregrine/xorg.conf
@@ -0,0 +1,24 @@
+Section "ServerLayout"
+  Identifier "Layout0"
+  Screen "Screen0"
+EndSection
+
+Section "Device"
+  Identifier "Card0"
+  Driver "fbdev"
+  Option "fbdev" "/dev/fb0" #linuxdeploy
+EndSection
+
+Section "Screen"
+  Identifier "Screen0"
+  Device "Card0"
+  DefaultDepth 24
+  SubSection "Display"
+    Depth 32
+  EndSubSection
+EndSection
+
+Section "ServerFlags"
+  Option "Pixmap" "24"
+EndSection
+
diff --git a/aports/device/linux-motorola-peregrine/06_fix_mdss_fb_rgb_mode.patch b/aports/device/linux-motorola-peregrine/06_fix_mdss_fb_rgb_mode.patch
new file mode 100644
index 00000000..301111f5
--- /dev/null
+++ b/aports/device/linux-motorola-peregrine/06_fix_mdss_fb_rgb_mode.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
+index 53112ca6..69673017 100644
+--- a/drivers/video/msm/mdss/mdss_fb.c
++++ b/drivers/video/msm/mdss/mdss_fb.c
+@@ -569,7 +569,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
+ 	mfd->bl_level = 0;
+ 	mfd->bl_scale = 1024;
+ 	mfd->bl_min_lvl = 30;
+-	mfd->fb_imgType = MDP_RGBA_8888;
++	mfd->fb_imgType = MDP_RGB_888;
+ 
+ 	mfd->pdev = pdev;
+ 	if (pdata->next)
diff --git a/aports/device/linux-motorola-peregrine/APKBUILD b/aports/device/linux-motorola-peregrine/APKBUILD
index ede9f313..4675b3d1 100644
--- a/aports/device/linux-motorola-peregrine/APKBUILD
+++ b/aports/device/linux-motorola-peregrine/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-peregrine"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Moto G 4G (2013) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -26,6 +26,7 @@ source="
 	00_fix_return_address.patch
 	02_gpu-msm-fix-gcc5-compile.patch
 	03_mdss_fb_refresh_rate.patch
+	06_fix_mdss_fb_rgb_mode.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
@@ -90,4 +91,5 @@ sha512sums="8e651741fce8b6263647ae3f91bbd8ac6d36178ba1bd7c7dc31829e52596efc151ea
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  03_mdss_fb_refresh_rate.patch"
+a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  03_mdss_fb_refresh_rate.patch
+384ae0bf2f5d7e15b0b60655693fd600b52c0f5bfcaa4ba7336d0ebeb224e84b99b597f77d26a1249e14a4e7bbc1629be00556b393bb9dd2266cb4bd67c3cfea  06_fix_mdss_fb_rgb_mode.patch"