diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD
index f9cc883da..d6d441643 100644
--- a/main/postmarketos-base-ui/APKBUILD
+++ b/main/postmarketos-base-ui/APKBUILD
@@ -1,7 +1,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base-ui
-pkgver=44
-pkgrel=1
+pkgver=45
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -31,8 +31,11 @@ subpackages="
 	$pkgname-bluez-obexd:obexd
 	$pkgname-elogind
 	$pkgname-flatpak
-	$pkgname-flatpak-systemd
+	$pkgname-flatpak-systemd:flatpak_systemd
 	$pkgname-networkmanager
+	$pkgname-modemmanager
+	$pkgname-modemmanager-systemd:modemmanager_systemd
+	$pkgname-modemmanager-openrc:modemmanager_openrc
 	$pkgname-openrc
 	$pkgname-openrc-settingsd:openrc_settingsd
 	$pkgname-qt-tweaks:qt_tweaks
@@ -66,6 +69,7 @@ _source644="
 	etc/elogind/logind.conf
 	etc/conf.d/bluetooth
 	etc/conf.d/openrc-settingsd
+	etc/conf.d/modemmanager
 	etc/conf.d/tinydm
 	etc/conf.d/wpa_supplicant
 	etc/pulse/default.pa.d/postmarketos.pa
@@ -78,6 +82,7 @@ _source644="
 	usr/lib/NetworkManager/conf.d/50-random-mac.conf
 	usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
 	usr/lib/systemd/system/flatpak-system-helper.service.d/wait-for-ntp.conf
+	usr/lib/systemd/system/ModemManager.service.d/quick-suspend-resume.conf
 	usr/lib/udev/rules.d/50-udmabuf.rules
 	usr/share/flatpak/remotes.d/flathub.flatpakrepo
 	usr/share/wireplumber/wireplumber.conf.d/50-bluetooth.conf
@@ -288,8 +293,32 @@ flatpak() {
 }
 
 flatpak_systemd() {
+	# note: can't use default_systemd since it slurps up units from other subpkgs
+	install_if="$pkgname-flatpak=$pkgver-r$pkgrel systemd"
 	amove usr/lib/systemd/system/flatpak-system-helper.service.d/wait-for-ntp.conf
-	default_systemd
+}
+
+modemmanager() {
+	install_if="$pkgname=$pkgver-r$pkgrel modemmanager"
+	mkdir -p "$subpkgdir"
+}
+
+modemmanager_systemd() {
+	# note: can't use default_systemd since it slurps up units from other subpkgs
+	install_if="$pkgname-modemmanager=$pkgver-r$pkgrel systemd"
+	amove usr/lib/systemd/system/ModemManager.service.d/quick-suspend-resume.conf
+}
+
+modemmanager_openrc() {
+	install_if="$pkgname-modemmanager=$pkgver-r$pkgrel openrc"
+	replaces="
+		device-pine64-pinephone
+		device-pine64-pinephonepro
+		device-purism-librem5
+		soc-qcom-modem-openrc
+	"
+
+	amove etc/conf.d/modemmanager
 }
 
 sha512sums="
@@ -297,6 +326,7 @@ sha512sums="
 8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4  rootfs-etc-elogind-logind.conf
 b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706  rootfs-etc-conf.d-bluetooth
 49fb494b659fe0149a93eafe109609acce6a470bb8acea160638d07e0e4b11af2544f34549d5ef2deb2914a7ef13d0d470b04ad62981f14f96999af02a5f24cf  rootfs-etc-conf.d-openrc-settingsd
+e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  rootfs-etc-conf.d-modemmanager
 44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0  rootfs-etc-conf.d-tinydm
 e9f6167d8e0af6d2b60dd4b95b7a58af3cb4856ea1650dc9f17d7562c603a578ea51597cd7b82401e74f9ffb66ce306b6478ef0c0d702de9f49c0a12613b8bea  rootfs-etc-conf.d-wpa_supplicant
 6c516635a61fbaa93102f02301a75070a91de837456b07a50e24a9e0ee5dac785087d4a8f78906807719ebf6f0124127383441cccf00475d9a91d3dbaf9d4d81  rootfs-etc-pulse-default.pa.d-postmarketos.pa
@@ -309,6 +339,7 @@ cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b
 d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc843519f628695e4df7602bfdcd3d79f2c2cd6e8256535c33b038  rootfs-usr-lib-NetworkManager-conf.d-50-random-mac.conf
 900554534191fa0797064d35350934cdd8af59f30f0ae7d8ec63c2e11c44a16c643d3024b6543940488cd590fec1d392548bcaacc3be88cddff90f69b17ece07  rootfs-usr-lib-NetworkManager-conf.d-50-use-dnsmasq.conf
 4f1e056e3bf6dcb9918fc35a87007304dcd16f3d2e1a920840455151f4f09001dace52097d0886a12d23c28b1646ea4fe907b6e65f54cfd22276201ba2da2fb9  rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf
+cc86775a7820eb683e67df7d23ebae9d72699a643ff1452c71daf38ac6c39a84fd1686e67351ab0a2c582f9fc0374410383e3a32bd378cf11a8fb6033fde35ac  rootfs-usr-lib-systemd-system-ModemManager.service.d-quick-suspend-resume.conf
 9431dd37801261002f2ac8a0c30483994897adaf7cb31e80fcb99b7354dbe3e10d79162a2f2baefc5d091bb192ff680f274d6481bb198958d08918529c64e26f  rootfs-usr-lib-udev-rules.d-50-udmabuf.rules
 54620e508a5070ec8819e3661e592acfcfd26c52170b0ecc4dbbc1c61998963ce20bf9d9b051a608b76d6fc17e61c65decc16602b7d58061b9149667a968d258  rootfs-usr-share-flatpak-remotes.d-flathub.flatpakrepo
 92930f027626825b027f585a9be180f8a6ebae6dc44d2cf8f9d43cce00db8cbb43c33fc341fe382abacb832ea1b6414dc4c8129d265b0258d096599b2e206a93  rootfs-usr-share-wireplumber-wireplumber.conf.d-50-bluetooth.conf
diff --git a/main/postmarketos-base-ui/rootfs-etc-conf.d-modemmanager b/main/postmarketos-base-ui/rootfs-etc-conf.d-modemmanager
new file mode 100644
index 000000000..3938840a4
--- /dev/null
+++ b/main/postmarketos-base-ui/rootfs-etc-conf.d-modemmanager
@@ -0,0 +1,6 @@
+# /etc/conf.d/modemmanager: config file for modemmanager
+
+# Add extra command line options to modemmanager, use with care
+# ModemManager --help for possible values
+# Use quick suspend/resume hooks
+modemmanager_opts="--test-quick-suspend-resume"
diff --git a/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-ModemManager.service.d-quick-suspend-resume.conf b/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-ModemManager.service.d-quick-suspend-resume.conf
new file mode 100644
index 000000000..96ceecfcc
--- /dev/null
+++ b/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-ModemManager.service.d-quick-suspend-resume.conf
@@ -0,0 +1,5 @@
+[Service]
+# Force the new quick suspend/resume mode until it's the default upstream,
+# see: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/1039
+ExecStart=
+ExecStart=/usr/sbin/ModemManager --test-quick-suspend-resume