diff --git a/device/device-huawei-y530/90-touchscreen-dev.rules b/device/device-huawei-y530/90-touchscreen-dev.rules
deleted file mode 100644
index b91459aee..000000000
--- a/device/device-huawei-y530/90-touchscreen-dev.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# udev rules file
-# All device names can be read from weston's logfile
-
-# Touchscreen detection
-SUBSYSTEM=="input", ATTRS{name}=="synaptics", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
-
diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD
index 6ae413bd3..49052c3d6 100644
--- a/device/device-huawei-y530/APKBUILD
+++ b/device/device-huawei-y530/APKBUILD
@@ -1,25 +1,23 @@
-pkgname=device-huawei-y530
-pkgver=1
-pkgrel=10
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname="device-huawei-y530"
 pkgdesc="Huawei Ascend Y530"
+pkgver=1
+pkgrel=11
 url="https://postmarketos.org"
-arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-huawei-y530 mkbootimg mesa-dri-swrast"
-makedepends=""
-install=""
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="
-	deviceinfo
-	90-touchscreen-dev.rules
-"
+arch="noarch"
 options="!check"
+depends="postmarketos-base linux-huawei-y530 mkbootimg mesa-dri-swrast"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
 
 package() {
-	install -D -m644 "$srcdir"/deviceinfo \
-		"$pkgdir"/etc/deviceinfo
-	install -D -m644 "$srcdir"/90-touchscreen-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
+	devicepkg_package $startdir $pkgname
 }
 
 nonfree_firmware() {
@@ -28,5 +26,4 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="cbe2c1d166f202923462ffe254d16d335eb0c7d16bd2c2aabb3aa8947278ce276bbe440aa03fc5098f28fb029750c5869ef280b514e36268ef2b8c0b5022fa78  deviceinfo
-b2ebcd94e54b474d5a0d03f25af0d152583cddbb8ae8a70b72d65e96c9114a11fd535ffc964b23a0852fd541198c940fe6e867dafb6e6a8a12cb6fa5d1538d45  90-touchscreen-dev.rules"
+sha512sums="c6d12a7869423b15b96938e05ca638b27a0e644ec4374978bfaacf9cf26d9bf6f4fa8a8e6bd708394ac0225fefe9f24b51a18b478730d1782cd64c5e6e0327f4  deviceinfo"
diff --git a/device/device-huawei-y530/deviceinfo b/device/device-huawei-y530/deviceinfo
index 13c1e7e09..2e5b75f2a 100644
--- a/device/device-huawei-y530/deviceinfo
+++ b/device/device-huawei-y530/deviceinfo
@@ -5,27 +5,28 @@ deviceinfo_format_version="0"
 deviceinfo_name="Huawei Ascend Y530"
 deviceinfo_manufacturer="Huawei"
 deviceinfo_date=""
-deviceinfo_nonfree="????"
 deviceinfo_dtb=""
-deviceinfo_modules=""
 deviceinfo_modules_initfs=""
-deviceinfo_external_storage="true"
-deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
 
 # Device related
 deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="854"
 deviceinfo_dev_touchscreen="/dev/input/event1"
+deviceinfo_dev_touchscreen_calibration=""
+deviceinfo_dev_keyboard=""
 
-# Fastboot related
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline=""
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
-deviceinfo_kernel_cmdline=""
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
+
diff --git a/device/device-samsung-klte/APKBUILD b/device/device-samsung-klte/APKBUILD
index 60215f4f9..0ed7bc4a6 100644
--- a/device/device-samsung-klte/APKBUILD
+++ b/device/device-samsung-klte/APKBUILD
@@ -1,3 +1,4 @@
+# Reference: <https://postmarketos.org/devicepkg>
 pkgname="device-samsung-klte"
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.2