diff --git a/pkg.info b/pkg.info
index f647de9..6b2553e 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: opensysusers
 description: A replacement for sysusers.d without systemd
 version: 0.7.4
-revision: 1
+revision: 2
 url: https://github.com/cromerc/opensysusers
 license: BSD-2-Clause
 architecture: any
@@ -15,3 +15,8 @@ make_depends:
   - docbook-xsl-nons
 provides:
   - sysusers
+downloads:
+  - url: https://github.com/cromerc/opensysusers/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 0d5f0a2737eed98e4de101b700d7bd8ad3091c2c83826d4d8a881f9b05ebfd8c
diff --git a/source-files/sysusers b/source-files/sysusers
new file mode 100644
index 0000000..1455eae
--- /dev/null
+++ b/source-files/sysusers
@@ -0,0 +1,38 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# The superuser
+u root    0     "Super User" /root
+
+# The nobody user for NFS file systems
+u nobody  65534 "Nobody"     -
+
+# Administrator group: can *see* more than normal users
+g adm     -     -            -
+
+# Administrator group: can *do* more than normal users
+g wheel   -     -            -
+
+# Access to certain kernel and userspace facilities
+g kmem    -     -            -
+g tty     5     -            -
+g utmp    -     -            -
+
+# Hardware access groups
+g audio   -     -            -
+g disk    -     -            -
+g input   -     -            -
+g kvm     -     -            -
+g lpadmin 209   -            -
+g optical -     -            -
+g render  -     -            -
+g storage -     -            -
+g uucp    -     -            -
+g video   -     -            -
+
+# Default group for normal users
+g users   -     -            -
diff --git a/source.sh b/source.sh
index c77065b..c9c42db 100644
--- a/source.sh
+++ b/source.sh
@@ -2,16 +2,6 @@
 # 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/cromerc/opensysusers/archive/refs/tags/${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() {
@@ -23,6 +13,12 @@ build() {
 package() {
   make DESTDIR="$BPM_OUTPUT" PREFIX=/usr HAVESYSTEMD=no install
 
+  # Install modified basic sysusers configuration
+  install -Dm644 "$BPM_WORKDIR"/sysusers "$BPM_OUTPUT"/usr/lib/sysusers.d/basic.conf
+
+  # Install BPM hook
   install -Dm644 "$BPM_WORKDIR"/20-opensysusers.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/20-opensysusers.bpmhook
-  install -Dm644 LICENSE "$BPM_OUTPUT"/usr/share/licenses/opensysusers/LICENSE
+
+  # Install package license
+  install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/opensysusers/LICENSE
 }