diff --git a/extra/flatpak/.SRCINFO b/extra/flatpak/.SRCINFO
index 29735ff35..cee009974 100644
--- a/extra/flatpak/.SRCINFO
+++ b/extra/flatpak/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flatpak
 	pkgdesc = Linux application sandboxing and distribution framework (formerly xdg-app)
-	pkgver = 1.15.8
+	pkgver = 1.15.9
 	pkgrel = 1
 	epoch = 1
 	url = https://flatpak.org
@@ -10,6 +10,7 @@ pkgbase = flatpak
 	checkdepends = valgrind
 	makedepends = docbook-xsl
 	makedepends = git
+	makedepends = glib2-devel
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
 	makedepends = meson
@@ -45,19 +46,11 @@ pkgbase = flatpak
 	depends = xdg-dbus-proxy
 	depends = xdg-utils
 	depends = zstd
-	source = git+https://github.com/flatpak/flatpak?signed#tag=1.15.8
-	source = git+https://gitlab.gnome.org/GNOME/libglnx.git
-	source = git+https://github.com/containers/bubblewrap
-	source = git+https://github.com/flatpak/xdg-dbus-proxy
-	source = git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
+	source = git+https://github.com/flatpak/flatpak?signed#tag=1.15.9
 	source = https://dl.flathub.org/repo/flathub.flatpakrepo
 	source = flatpak-bindir.sh
 	validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90
-	b2sums = e71a1d60eeda7d2fcbf714f153fb494ef2d0fa72d12654b3f04b889a35c40c7181b04e8d1658b53e256cee8a8982fb982d685d3d926fa50f3e866e178c1156f7
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
+	b2sums = bfc98f48a4489c446975759a82f92412a8d717c4df06cf3ebf75e8306ce3b410e2bed084da0f4a917353f81692a93fbb0fcee738993c163d14839d5c3fef52c7
 	b2sums = c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54
 	b2sums = 1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc
 
diff --git a/extra/flatpak/.nvchecker.toml b/extra/flatpak/.nvchecker.toml
new file mode 100644
index 000000000..0b7fce9b7
--- /dev/null
+++ b/extra/flatpak/.nvchecker.toml
@@ -0,0 +1,4 @@
+[flatpak]
+source = "github"
+github = "flatpak/flatpak"
+use_max_tag = true
diff --git a/extra/flatpak/PKGBUILD b/extra/flatpak/PKGBUILD
index 0778bdd6a..6b94af125 100644
--- a/extra/flatpak/PKGBUILD
+++ b/extra/flatpak/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(
   flatpak
   flatpak-docs
 )
-pkgver=1.15.8
+pkgver=1.15.9
 pkgrel=1
 epoch=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly xdg-app)"
@@ -54,6 +54,7 @@ depends=(
 makedepends=(
   docbook-xsl
   git
+  glib2-devel
   gobject-introspection
   gtk-doc
   meson
@@ -68,18 +69,10 @@ checkdepends=(
 )
 source=(
   "git+https://github.com/flatpak/flatpak?signed#tag=$pkgver"
-  git+https://gitlab.gnome.org/GNOME/libglnx.git
-  git+https://github.com/containers/bubblewrap
-  git+https://github.com/flatpak/xdg-dbus-proxy
-  git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
   https://dl.flathub.org/repo/flathub.flatpakrepo
   flatpak-bindir.sh
 )
-b2sums=('e71a1d60eeda7d2fcbf714f153fb494ef2d0fa72d12654b3f04b889a35c40c7181b04e8d1658b53e256cee8a8982fb982d685d3d926fa50f3e866e178c1156f7'
-        'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
+b2sums=('bfc98f48a4489c446975759a82f92412a8d717c4df06cf3ebf75e8306ce3b410e2bed084da0f4a917353f81692a93fbb0fcee738993c163d14839d5c3fef52c7'
         'c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54'
         '1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc')
 validpgpkeys=(
@@ -88,13 +81,6 @@ validpgpkeys=(
 
 prepare() {
   cd flatpak
-
-  git submodule init
-  git submodule set-url subprojects/libglnx "$srcdir/libglnx"
-  git submodule set-url subprojects/bubblewrap "$srcdir/bubblewrap"
-  git submodule set-url subprojects/dbus-proxy "$srcdir/xdg-dbus-proxy"
-  git submodule set-url subprojects/variant-schema-compiler "$srcdir/variant-schema-compiler"
-  git -c protocol.file.allow=always -c protocol.allow=never submodule update
 }
 
 build() {