diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD
index 09a32e270..3a405608e 100644
--- a/device/community/device-nokia-n900/APKBUILD
+++ b/device/community/device-nokia-n900/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=8.1
-pkgrel=1
+pkgver=8.2
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -18,35 +18,36 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
-	deviceinfo
-	uboot-script.cmd
-	backlight-enable.sh
-	udev/90-touchscreen-dev.rules
-	udev/10-nokia-modem.rules
-	acpi_handler.sh
-	acpi.map
-	keymaps/rx51_us.map
-	keymaps/rx51_ch.map
-	keymaps/rx51_it.map
-	keymaps/rx51_fise.map
-	keymaps/40-xkb.conf
-	pointercal
-	asound.state.speakers
-	asound.state.headset
-	i3wm/scripts/battery-bq27200
-	i3wm/scripts/ofono
-	i3wm/scripts/calendar
-	i3wm/scripts/wifi
-	i3wm/conky.conf
-	i3wm/i3wm.conf
-	i3wm/i3blocks.conf
-	i3wm/protip_shell.sh
-	xorg.conf
-	10-noroot-suspend
 	10-initfs-keymap.files
 	10-initfs-keymap.sh
+	10-noroot-suspend
+	acpi.map
+	acpi_handler.sh
+	asound.state.headset
+	asound.state.speakers
+	backlight-enable.sh
 	device-nokia-n900.start
+	deviceinfo
+	i3wm/conky.conf
+	i3wm/i3blocks.conf
+	i3wm/i3wm.conf
+	i3wm/protip_shell.sh
+	i3wm/scripts/battery-bq27200
+	i3wm/scripts/calendar
+	i3wm/scripts/ofono
+	i3wm/scripts/wifi
+	keymaps/40-xkb.conf
+	keymaps/rx51_ch.map
+	keymaps/rx51_fise.map
+	keymaps/rx51_it.map
+	keymaps/rx51_us.map
+	n900-wlan-data.initd
+	pointercal
+	uboot-script.cmd
+	udev/10-nokia-modem.rules
+	udev/90-touchscreen-dev.rules
 	x11-keymap
+	xorg.conf
 "
 options="!check !archcheck"
 
@@ -153,8 +154,11 @@ i3wm() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="linux-firmware-ti-connectivity"
-	mkdir "$subpkgdir"
+	depends="linux-firmware-ti-connectivity wl1251-cal"
+	install="$subpkgname.post-install"
+	triggers="$subpkgname.trigger=/lib/firmware/ti-connectivity"
+
+	install -Dm755 "$srcdir/n900-wlan-data.initd" "$subpkgdir/etc/init.d/n900-wlan-data"
 }
 
 sha512sums="
@@ -187,4 +191,5 @@ a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef2
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
 654f2e1b8b7b64fc8c82a5f3c2b76b9d88f56d8dda520c1ce162648d65031bf62702e3bd43e135ab040b927c403f9970d6efae53f957bf1e55954125b358b313  x11-keymap
+b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 "
diff --git a/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.post-install b/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.post-install
new file mode 100644
index 000000000..947a3c7ae
--- /dev/null
+++ b/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add n900-wlan-data boot
diff --git a/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.trigger b/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.trigger
new file mode 100644
index 000000000..98c2f77eb
--- /dev/null
+++ b/device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.trigger
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -f /lib/firmware/ti-connectivity/wl1251-nvs.bin ] && n900-update-wl1251
+
+exit 0
diff --git a/device/community/device-nokia-n900/n900-wlan-data.initd b/device/community/device-nokia-n900/n900-wlan-data.initd
new file mode 100644
index 000000000..e69bf3a79
--- /dev/null
+++ b/device/community/device-nokia-n900/n900-wlan-data.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+description="Update N900 WLAN calibration data"
+
+depend()
+{
+	before modules
+	after localmount
+}
+
+start()
+{
+	if [ ! -f /var/lib/n900_cal/done ]
+	then
+		n900-update-wl1251
+		mkdir -p /var/lib/n900_cal
+		touch /var/lib/n900_cal/done
+	fi
+
+	eend $?
+}