diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD
index e9befaab8..4bcb94f10 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=9.0
-pkgrel=2
+pkgver=9.1
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -42,6 +42,7 @@ source="
 	keymaps/rx51_it.map
 	keymaps/rx51_us.map
 	lock.sh
+	modules.blocklist
 	n900-wlan-data.initd
 	pointercal
 	uboot-script.cmd
@@ -114,6 +115,10 @@ package() {
 	install -D -m644 "$srcdir"/keymaps/rx51_se.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz
 
+	# Module blocklist
+	install -D -m644 "$srcdir"/modules.blocklist \
+		"$pkgdir"/etc/modprobe.d/n900-module-blocklist.conf
+
 	postmarketos-mvcfg-package "$pkgdir" "$pkgname"
 }
 
@@ -192,6 +197,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
+b76958bcba6e704bdf06194998f05bc5c86c0678329438b784bd77eaac9cab352aadc912bda8f3780406ff50fd3e05f6d32d021c49987285d1c0dc05ad5e73c4  modules.blocklist
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd
diff --git a/device/community/device-nokia-n900/device-nokia-n900.post-install b/device/community/device-nokia-n900/device-nokia-n900.post-install
index 5a3cc2ee1..72bc4395c 100644
--- a/device/community/device-nokia-n900/device-nokia-n900.post-install
+++ b/device/community/device-nokia-n900/device-nokia-n900.post-install
@@ -14,10 +14,4 @@ rc-update add ofono default
 # Disable swclock because rtc is working
 rc-update -q del swclock boot
 
-# Load nokia-modem module on boot
-NMC=/etc/modules-load.d/nokia-modem.conf
-if [ ! -f $NMC ] || [ -z "$(grep nokia-modem $NMC)" ]; then
-	echo "nokia-modem" >> /etc/modules-load.d/nokia-modem.conf
-fi
-
 exit 0
diff --git a/device/community/device-nokia-n900/device-nokia-n900.pre-upgrade b/device/community/device-nokia-n900/device-nokia-n900.pre-upgrade
index f7f8588f1..aae609911 100644
--- a/device/community/device-nokia-n900/device-nokia-n900.pre-upgrade
+++ b/device/community/device-nokia-n900/device-nokia-n900.pre-upgrade
@@ -4,3 +4,7 @@ postmarketos-mvcfg-pre-upgrade \
 	device-nokia-n900 \
 	/etc/conf.d/hwclock
 
+postmarketos-mvcfg-pre-upgrade \
+	device-nokia-n900-v2 \
+	/etc/modules-load.d/nokia-modem.conf
+
diff --git a/device/community/device-nokia-n900/modules.blocklist b/device/community/device-nokia-n900/modules.blocklist
new file mode 100644
index 000000000..e033ed16d
--- /dev/null
+++ b/device/community/device-nokia-n900/modules.blocklist
@@ -0,0 +1,17 @@
+# Modem is suspected to be partly responsible for dma crashes.
+# It is probably safe to probe manually later as needed
+blacklist omap_ssi
+blacklist nokia_modem
+blacklist ssi_protocol
+blacklist cmt_speech
+blacklist hsi_char
+blacklist hsi
+# rx51-battery is not absolutely necessary to running system, but can be
+# useful to keep around since it can detect battery design capacity
+blacklist rx51_battery
+# extra modules to block for pm purposes. lifted from maemo leste
+# https://github.com/maemo-leste/leste-config/blob/master/leste-config-n900/etc/modprobe.d/blacklist-pm.conf.leste
+blacklist omap3_isp
+blacklist hci_nokia
+blacklist hci_uart
+blacklist ehci_omap