diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD
index 528d093ca..76b76b951 100644
--- a/device/main/device-pine64-pinephone/APKBUILD
+++ b/device/main/device-pine64-pinephone/APKBUILD
@@ -4,7 +4,7 @@
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinephone
-pkgver=0.21
+pkgver=0.22
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -45,6 +45,7 @@ source="
 	gpsd_pinephone.initd
 	hwtest.ini
 	kirigami-lowpower.sh
+	modemmanager.conf
 	setup-modem.sh
 	setup-modem.sh.ofono
 	sysrq.conf
@@ -111,6 +112,8 @@ package() {
 		"$pkgdir"/usr/bin/pinephone_setup-modem
 	install -Dm644 "$srcdir"/90-modem-eg25.rules -t \
 		"$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 "$srcdir"/modemmanager.conf \
+		"$pkgdir"/etc/conf.d/modemmanager
 
 	# Wifi / PM
 	install -Dm644 "$srcdir"/70-wifi-pm.rules -t \
@@ -165,6 +168,7 @@ ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd4644
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
+3d6e9030125afc1dc3b654d1ce5d124ddd3ef3ad1a4d3e46c8168cf3f8a3762ffd0c75427759740ae26bd5c4f32b6704b7cf7e5806434884560fa704b7e72921  modemmanager.conf
 fa063e2863afc48e627acc1a5b213a81499ba1dd30325f74f118a44e3964aec7e597b1f4bd318b7cf5bf14f27daf88e6ad9fc277ab106cbbe1189fdcc650d5c1  setup-modem.sh
 0c81d758e1bcb56ed2cdaf91124121ebbd4dd7a5e25f02a7685b837faf660949d05f6b07b39a1c6a9ca22a7029cdcf3c6dac8f1038e37c8a34cb7c5702e9df51  setup-modem.sh.ofono
 f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee  sysrq.conf
diff --git a/device/main/device-pine64-pinephone/modemmanager.conf b/device/main/device-pine64-pinephone/modemmanager.conf
new file mode 100644
index 000000000..574bea1df
--- /dev/null
+++ b/device/main/device-pine64-pinephone/modemmanager.conf
@@ -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
+# Disable suspend/resume hooks for the EG25-G modem in the PinePhone
+modemmanager_opts="--test-no-suspend-resume"