diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD
index 05bd49541..1c44d813c 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=17
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,6 +23,7 @@ subpackages="
 	$pkgname-bluez
 	$pkgname-bluez-obexd:_obexd
 	$pkgname-elogind
+	$pkgname-flatpak
 	$pkgname-networkmanager
 	$pkgname-openrc-settingsd:_openrc_settingsd
 	$pkgname-pulseaudio
@@ -217,6 +218,13 @@ iwd() {
 	amove usr/lib/NetworkManager/conf.d/50-iwd.conf
 }
 
+flatpak() {
+	install_if="$pkgname=$pkgver-r$pkgrel flatpak"
+	install="$subpkgname.post-install"
+
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6  rootfs-etc-chrony-chrony.conf
 8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4  rootfs-etc-elogind-logind.conf
diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-flatpak.post-install b/main/postmarketos-base-ui/postmarketos-base-ui-flatpak.post-install
new file mode 100644
index 000000000..cecedd2e5
--- /dev/null
+++ b/main/postmarketos-base-ui/postmarketos-base-ui-flatpak.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# add a default repo (flathub.org)
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo