diff --git a/pkg.info b/pkg.info
index 43420ed..0c7754f 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,10 +1,28 @@
 name: e2fsprogs
 description: Filesystem utilities for use with the ext2 filesystem. Also includes support for the ext3 and ext4 filesystems
 version: 1.47.3
+revision: 2
 url: https://e2fsprogs.sourceforge.net/
-license: LGPL2,GPL2
+license: LGPL2,GPL2,MIT
 architecture: any
-depends: ["glibc","util-linux"]
-optional_depends: ["lvm2"]
-make_depends: ["fuse3","udev"]
 type: source
+depends:
+  - glibc
+  - util-linux
+optional_depends:
+  - lvm2
+make_depends:
+  - fuse3
+  - udev
+downloads:
+  - url: https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v${BPM_PKG_VERSION}/e2fsprogs-${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 2f5164e64dd7d91eadd1e0e8a77d92c06dd7837bb19f1d9189ce1939b363d2b4
+split_packages:
+  - name: e2fsprogs
+  - name: fuse2fs
+    description: Ext2/3/4 filesystem driver for FUSE
+    depends:
+      - fuse3
+      - e2fsprogs
diff --git a/source.sh b/source.sh
index 7de0179..f05c77a 100644
--- a/source.sh
+++ b/source.sh
@@ -2,27 +2,15 @@
 # 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://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v${BPM_PKG_VERSION}/e2fsprogs-${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
-  ../configure --prefix=/usr           \
-               --sysconfdir=/etc       \
-               --enable-elf-shlibs     \
-               --disable-libblkid      \
-               --disable-libuuid       \
-               --disable-uuidd         \
+  ./configure --prefix=/usr        \
+               --sysconfdir=/etc   \
+               --enable-elf-shlibs \
+               --disable-libblkid  \
+               --disable-libuuid   \
+               --disable-uuidd     \
                --disable-fsck
   make
 }
@@ -30,14 +18,31 @@ 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
   make check
 }
 
 # 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
+package_e2fsprogs() {
   make DESTDIR="$BPM_OUTPUT" install
-  rm -fv "$BPM_OUTPUT"/usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+
+  # Remove static libraries
+  rm -f "$BPM_OUTPUT"/usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+
+  # Remove fuse2fs files from main package
+  rm "$BPM_OUTPUT"/usr/{bin/fuse2fs,share/man/man1/fuse2fs.1}
+
+  # Install package license
+  install -Dm644 "$BPM_SOURCE"/NOTICE "$BPM_OUTPUT"/usr/share/licenses/e2fsprogs/NOTICE
+}
+
+package_fuse2fs() {
+  install -Dm755 misc/fuse2fs "$BPM_OUTPUT"/usr/bin/fuse2fs
+
+  # Install man page
+  install -Dm644 misc/fuse2fs.1 "$BPM_OUTPUT"/usr/share/man/man1/fuse2fs.1
+
+  # Install package license
+  install -d "$BPM_OUTPUT"/usr/share/licenses/
+  ln -sf e2fsprogs "$BPM_OUTPUT"/usr/share/licenses/fuse2fs
 }