diff --git a/common/shlibs b/common/shlibs
index 1234ca6182d..36181bf080f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2850,3 +2850,7 @@ libbaccats-7.4.7.so bacula-common-7.4.7_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
 libyara.so.3 libyara-3.5.0_1
+libgcab-1.0.so.0 gcab-0.7_1
+libappstream-glib.so.8 appstream-glib-0.6.13_1
+libappstream-builder.so.8 appstream-glib-0.6.13_1
+libflatpak.so.0 flatpak-0.9.3_2
diff --git a/srcpkgs/flatpak-devel b/srcpkgs/flatpak-devel
new file mode 120000
index 00000000000..3f5bc0dd206
--- /dev/null
+++ b/srcpkgs/flatpak-devel
@@ -0,0 +1 @@
+flatpak
\ No newline at end of file
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index e00d44b7d70..5be4138f9bb 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,10 +1,10 @@
 # Template file for 'flatpak'
 pkgname=flatpak
 version=0.9.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-documentation --with-system-bubblewrap"
-hostmakedepends="bubblewrap libxslt pkg-config"
+hostmakedepends="bubblewrap libxslt pkg-config glib-devel"
 makedepends="elfutils-devel fuse-devel glib-devel gpgme-devel json-glib-devel
  libarchive-devel libcap-devel libostree-devel libseccomp-devel libsoup-devel
  libXau-devel polkit-devel"
@@ -16,6 +16,19 @@ homepage="http://flatpak.org/"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
 checksum=a842e1ee03178a5f4236c39786433f6f822d22595a9ef4525004a6c72b4b3846
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" glib-devel"
-fi
+post_install() {
+	rm -rf $DESTDIR/usr/lib/systemd
+}
+
+flatpak-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} glib-devel libostree-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+	}
+}