diff --git a/pkg.info b/pkg.info
index c72490e..d7456e2 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,11 +1,30 @@
 name: elogind
 description: The systemd project's 'logind', extracted to a standalone package
-version: 255.17
-revision: 2
+version: "255.17"
+revision: 3
 url: https://github.com/elogind/elogind
 license: GPL2-only,LGPL2.1-only
 architecture: any
-depends: ["acl", "dbus", "gcc-libs", "glibc", "libcap", "pam", "udev", "util-linux"]
-optional_depends: ["polkit"]
-make_depends: ["docbook-xsl-nons", "gperf", "intltool", "meson", "python-jinja"]
 type: source
+depends:
+  - acl
+  - dbus
+  - gcc-libs
+  - glibc
+  - libcap
+  - pam
+  - udev
+  - util-linux
+optional_depends:
+  - polkit
+make_depends:
+  - docbook-xsl-nons
+  - gperf
+  - intltool
+  - meson
+  - python-jinja
+downloads:
+  - url: https://github.com/elogind/elogind/archive/v${BPM_PKG_VERSION}/elogind-${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: a9725ae3f73f8d910de84c108bc11bfd4c782bef6a4190b2ec70c5d2f22344db
diff --git a/source-files/elogind.esv b/source-files/elogind.esv
index 19f43ef..6230b65 100644
--- a/source-files/elogind.esv
+++ b/source-files/elogind.esv
@@ -1,6 +1,5 @@
 name: elogind
 description: Start elogind
-dependencies: ["dbus"]
 type: background
 start_cmd: /usr/libexec/elogind
 exit_method: kill
diff --git a/source.sh b/source.sh
index 3340e80..daf11b5 100644
--- a/source.sh
+++ b/source.sh
@@ -2,22 +2,9 @@
 # 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/elogind/elogind/archive/v${BPM_PKG_VERSION}/elogind-${BPM_PKG_VERSION}.tar.gz"
-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               \
               --buildtype=release             \
@@ -26,33 +13,36 @@ build() {
               -Ddocdir=/usr/share/doc/elogind \
               -Dcgroup-controller=elogind     \
               -Ddev-kvm-mode=0660             \
-              -Ddbuspolicydir=/etc/dbus-1/system.d ..
-  ninja
+              -Ddbuspolicydir=/etc/dbus-1/system.d build
+  meson compile -C build
 }
 
 # The check function is executed in the source directory
 # This function is used to run tests to verify the package has been compiled correctly
 check() {
-  cd build
-
   # Get all tests
-  test_list=$(meson test --list | tr -d ' ' | cut -d'/' -f2) 2> /dev/null
+  test_list=$(meson test -C build --list | tr -d ' ' | cut -d'/' -f2) 2> /dev/null
   # Remove failing test
   test_list=${test_list//check-version-history}
   # Run tests
-  meson test $test_list
+  meson test -C build $test_list
 }
 
 # 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"
 
+  # Create symlink for systemd compatibility
   mkdir "$BPM_OUTPUT"/usr/include/systemd/
   ln -sfn elogind "$BPM_OUTPUT"/usr/include/systemd/elogind
-  
+
+  # Install pam module
   install -Dm644 "$BPM_WORKDIR"/elogind-user "$BPM_OUTPUT"/etc/pam.d/elogind-user
+
+  # Install esvm service
   install -Dm644 "$BPM_WORKDIR"/elogind.esv "$BPM_OUTPUT"/etc/esvm/services/elogind.esv
-  install -Dm644 ../LICENSE.{GPL2,LGPL2.1} -t "$BPM_OUTPUT"/usr/share/licenses/elogind/elogind
+
+  # Install package license
+  install -Dm644 "$BPM_SOURCE"/LICENSE.{GPL2,LGPL2.1} -t "$BPM_OUTPUT"/usr/share/licenses/elogind/elogind
 }