diff --git a/pkg.info b/pkg.info
index cfff905..b9737af 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,10 +1,46 @@
 name: flatpak
 description: Linux application sandboxing and distribution framework
 version: 1.16.1
-revision: 5
+revision: 6
 url: https://flatpak.org/
 license: LGPL2.1-or-later
 architecture: any
-depends: ["appstream", "bubblewrap", "curl", "dbus", "fuse3", "gcc-libs", "gdk-pixbuf", "glib", "glibc", "gpgme", "json-glib", "libarchive", "libseccomp", "libxau", "libxml2", "ostree", "polkit", "sysusers", "wayland", "xdg-dbus-proxy", "xdg-desktop-portal", "xdg-utils", "zstd"]
-make_depends: ["docbook-xsl-nons", "gobject-introspection", "gtk-doc", "meson", "python-pyparsing", "wayland-protocols", "xmlto", "valgrind"]
 type: source
+depends:
+  - appstream
+  - bubblewrap
+  - curl
+  - dbus
+  - fuse3
+  - gcc-libs
+  - gdk-pixbuf
+  - glib
+  - glibc
+  - gpgme
+  - json-glib
+  - libarchive
+  - libseccomp
+  - libxau
+  - libxml2
+  - ostree
+  - polkit
+  - sysusers
+  - wayland
+  - xdg-dbus-proxy
+  - xdg-desktop-portal
+  - xdg-utils
+  - zstd
+make_depends:
+  - docbook-xsl-nons
+  - gobject-introspection
+  - gtk-doc
+  - meson
+  - python-pyparsing
+  - wayland-protocols
+  - xmlto
+  - valgrind
+downloads:
+  - url: https://github.com/flatpak/flatpak/releases/download/${BPM_PKG_VERSION}/flatpak-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 2b47e8f2d90d35d29339ed78e1a6eabb36eefa9cfa5a5ca3b0d1f27502c43675
diff --git a/source.sh b/source.sh
index d8494dc..a096a17 100644
--- a/source.sh
+++ b/source.sh
@@ -2,34 +2,32 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/${BPM_PKG_VERSION}/flatpak-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-  
-  meson setup --prefix=/usr --libdir=/usr/lib --localstatedir=/var -Ddbus_config_dir=/usr/share/dbus-1/system.d -Dsystemd=disabled -Dselinux_module=disabled -Dsystem_bubblewrap=bwrap -Dsystem_dbus_proxy=xdg-dbus-proxy -Dgtkdoc=disabled -Dtests=false
-  ninja
+  meson setup --prefix=/usr \
+              --libdir=/usr/lib \
+              --localstatedir=/var \
+              -Ddbus_config_dir=/usr/share/dbus-1/system.d \
+              -Dsystemd=disabled \
+              -Dselinux_module=disabled \
+              -Dsystem_bubblewrap=bwrap \
+              -Dsystem_dbus_proxy=xdg-dbus-proxy \
+              -Dgtkdoc=disabled \
+              -Dtests=false \
+              build
+  meson compile -C build
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-  DESTDIR="$BPM_OUTPUT" ninja install
+  meson install -C build --destdir="$BPM_OUTPUT"
 
   # Remove systemd files
   rm -r "$BPM_OUTPUT"/usr/lib/systemd
+  rm -r "$BPM_OUTPUT"/usr/lib/tmpfiles.d
 
+  # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/flatpak/COPYING
 }