diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index c39176ca9..0f6f8bdbb 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
 pkgver=6
-pkgrel=5
+pkgrel=6
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
 url="https://puri.sm"
 arch="noarch !armhf !x86" # x86: aports#11807
@@ -37,6 +37,7 @@ _pmb_recommends="calls
 	xdg-user-dirs
 	xorg-server-xwayland
 	"
+_pmb_groups="feedbackd"
 subpackages="$pkgname-qt_tweaks"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
index aaa9ae215..3492ef3e8 100644
--- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
+++ b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
@@ -6,3 +6,15 @@ rc-update add bluetooth default
 rc-update add iio-sensor-proxy default
 dconf update
 tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
+
+# Add the user to relevant groups in post-upgrade (symlink to post-install).
+# Note that we don't want to rely on users existing in post-install
+# (pmaports#820), therefore the group is also set via _pmb_groups during
+# 'pmbootstrap install'. When adding a new group here, keep _pmb_groups in
+# sync.
+default_user=$(getent passwd "10000" | cut -d: -f1)
+if [ -n "$default_user" ]; then
+	usermod -aG feedbackd "$default_user"
+fi
+
+exit 0