diff --git a/device/device-samsung-golden/APKBUILD b/device/device-samsung-golden/APKBUILD
index 1c2b59c91..202d6a339 100644
--- a/device/device-samsung-golden/APKBUILD
+++ b/device/device-samsung-golden/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-samsung-golden"
-pkgdesc="Samsung Galaxy SIII mini"
+pkgdesc="Samsung Galaxy S III mini"
 pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
@@ -11,10 +11,12 @@ depends="postmarketos-base mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
 	deviceinfo
+	kwin.sh
 	downstream/init-usb-hook.sh
 	downstream/modules-load.conf
 	downstream/module-config.conf
@@ -44,13 +46,23 @@ kernel_downstream() {
 		"$subpkgdir"/etc/modprobe.d/00-module-config.conf
 }
 
+kernel_mainline() {
+	pkgdesc="Mainline kernel"
+	depends="linux-postmarketos-novathor mesa-git mesa-git-glapi mesa-git-gl mesa-git-gles mesa-git-egl mesa-git-gbm mesa-git-dri-lima mesa-git-dri-kmsro"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+
+	# Plasma Mobile
+	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
+}
+
 nonfree_firmware() {
 	pkgdesc="WiFi/BT firmware"
 	depends="firmware-samsung-golden"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="f40b3cb40fa0a9ff58680054117bf7b235b33b7c8899a6e8b324cd080779a2b9da5ce23c71f0966fe6ba5acc9e6816224d1ef53157223bf7a6f4718a97b4f51e  deviceinfo
+sha512sums="1f4b05de8d4e8917d6b22eca6c67b1a5cc610efe2800c56d14225d837ccf6384967412c5085ee3eacecd3388cf101a1bdc04a829161ed98a63765214bc70453f  deviceinfo
+685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh
 769f76b2b0dc5279c514181f6cc915c045562df0c1fe08c54b6588d11ff2c75441a3a4f78d6dde669c82e1c572a66bdde475da3e289d334e3255fcf15430c044  init-usb-hook.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf
 436900f627e4ec7e8359bfa6b5d0ac98c69cdd3f3b5e68d23354fa87d79beef866afd6c4cf27b97e9b608cce44fe8d116594f3b08520c9c05624bcf58b61c7f1  module-config.conf"
diff --git a/device/device-samsung-golden/deviceinfo b/device/device-samsung-golden/deviceinfo
index 0676b733f..7735ae229 100644
--- a/device/device-samsung-golden/deviceinfo
+++ b/device/device-samsung-golden/deviceinfo
@@ -2,11 +2,11 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy SIII mini"
+deviceinfo_name="Samsung Galaxy S III mini"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-golden"
 deviceinfo_date=""
-deviceinfo_dtb=""
+deviceinfo_dtb_mainline="ste-ux500-samsung-golden"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"
 
@@ -15,13 +15,18 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
-deviceinfo_dev_touchscreen="/dev/input/event2"
+deviceinfo_dev_touchscreen_downstream="/dev/input/event2"
+deviceinfo_dev_touchscreen_mainline="/dev/input/by-path/platform-soc-event"
 deviceinfo_dev_touchscreen_calibration=""
 deviceinfo_dev_keyboard=""
+deviceinfo_getty="ttyAMA2;115200"
+
+deviceinfo_kernel_cmdline_mainline="console=ttyAMA2,115200 PMOS_NO_OUTPUT_REDIRECT"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_dtb_second_mainline="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
diff --git a/device/device-samsung-golden/kwin.sh b/device/device-samsung-golden/kwin.sh
new file mode 100644
index 000000000..64673d012
--- /dev/null
+++ b/device/device-samsung-golden/kwin.sh
@@ -0,0 +1 @@
+export KWIN_DRM_DEVICE_NODE=/dev/dri/card1