diff --git a/device/device-samsung-maguro/90-android-touch-dev.rules b/device/device-samsung-maguro/90-android-touch-dev.rules
deleted file mode 100644
index ecb1583d4..000000000
--- a/device/device-samsung-maguro/90-android-touch-dev.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# use 'weston-calibrator' to calibrate the touchscreen!
-SUBSYSTEM=="input", ATTRS{name}=="Melfas MMSxxx Touchscreen", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" \
-ENV{WL_CALIBRATION}="1.020764 0.024113 -27.560623 -0.021433 1.007368 0.578735"
-
diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
index f8bedce81..992bd64b9 100644
--- a/device/device-samsung-maguro/APKBUILD
+++ b/device/device-samsung-maguro/APKBUILD
@@ -1,26 +1,30 @@
+# Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=13
+pkgrel=14
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
 depends="linux-samsung-maguro mkbootimg firmware-samsung-maguro"
-makedepends=""
+makedepends="devicepkg-dev"
 install=""
-subpackages=""
-source="
-	deviceinfo
-	90-android-touch-dev.rules
-"
+subpackages="$pkgname-mesa"
+source="deviceinfo"
 options="!check"
 
-package() {
-	install -D -m644 "$srcdir"/deviceinfo \
-		"$pkgdir"/etc/deviceinfo
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
+build() {
+	devicepkg_build $startdir $pkgname
 }
 
-sha512sums="56f67205541eba307c333fbccd8510d9d972699be35bade8762028fc18f0c3c6f904eadc4fced783f042c1eeb57adc684915b8bd90f954cfb6560af662526928  deviceinfo
-f8c85b0ffcee751ee30d5f1fd8ed8e8413d9599875839fbc9bcfd85f08dbf203fecbd171fc3fe4e2742c5b8243132f6110142ff41193d6ad7df29b411516e199  90-android-touch-dev.rules"
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+mesa() {
+	install_if="$pkgname mesa"
+	depends="mesa-dri-swrast"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="dce64fc8cb993e62ffe3e4ad243ba18bf78dbde27f776f0e9dea9e426709cf5498df82eb049864471db6c3c2683a1f7563ab23b823cf96bf37cc6570b869a0b8  deviceinfo"
diff --git a/device/device-samsung-maguro/deviceinfo b/device/device-samsung-maguro/deviceinfo
index b20fb6d65..e126676e5 100644
--- a/device/device-samsung-maguro/deviceinfo
+++ b/device/device-samsung-maguro/deviceinfo
@@ -26,3 +26,4 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
+deviceinfo_kernel_cmdline="console=ttyFIQ0"
diff --git a/device/linux-samsung-maguro/APKBUILD b/device/linux-samsung-maguro/APKBUILD
index c5cc1a067..e0c08a282 100644
--- a/device/linux-samsung-maguro/APKBUILD
+++ b/device/linux-samsung-maguro/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-maguro"
 pkgver=3.0.31
-pkgrel=9
+pkgrel=10
 pkgdesc="Samsung Galaxy Nexus kernel from LineageOS"
 arch="armhf"
 _carch="arm"
@@ -58,7 +58,7 @@ package() {
 }
 
 sha512sums="f117b3202c3db1a575598fd87ee27080db5c447c986ced677b63e6b00613ebfab58d634bf63b8bcf0c229eb0bec4dc81b13d7cfda3c2aee62e9ed8e26eeb860c  linux-samsung-maguro-e14e5fe679a63eef92346cde874175d8b62b6a4a.tar.gz
-6ba270b415506ef4e0a34dcd775d9d59cb749d2a1f4b9863444b866567ed7b05594215ae5ae4f8d302be826a64df97e6824ef38184b7566026d0e73801ed528b  config-samsung-maguro.armhf
+eb9bd3f80fd57a0f8be7e5236f4bc8d32159dae635327e656e598c48438e07e81085b4b687a325f18941fbea4d558c2408f8852f6f528500bd682a4f89c6bf22  config-samsung-maguro.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 d8cdc1137e6a4ad78a3a31acc40f0c98f4db272eaf5b90ee850abb83b80916c4ff3c18a0a181e94eebead44213f6314e3363d0c4b91d95ee1adafbcad6dc57ab  android_paranoid_network.patch
 65eb11dca6645073885228af6aae6efa40b6f063fd04157b501acf40368bf331dd701f746ed187659f654a9354ddf304aaefca8ffc9ea2b00c145c61162e1189  fix_old_perl_code.patch"
diff --git a/device/linux-samsung-maguro/config-samsung-maguro.armhf b/device/linux-samsung-maguro/config-samsung-maguro.armhf
index e89b28cd0..bdd03d959 100644
--- a/device/linux-samsung-maguro/config-samsung-maguro.armhf
+++ b/device/linux-samsung-maguro/config-samsung-maguro.armhf
@@ -384,10 +384,10 @@ CONFIG_PL310_ERRATA_727915=y
 CONFIG_ARM_GIC=y
 CONFIG_FIQ_GLUE=y
 CONFIG_FIQ_DEBUGGER=y
-# CONFIG_FIQ_DEBUGGER_NO_SLEEP is not set
+CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 # CONFIG_FIQ_DEBUGGER_WAKEUP_IRQ_ALWAYS_ON is not set
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
-# CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE is not set
+CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 
 #
 # Bus support