diff --git a/.SRCINFO b/.SRCINFO
index 6233901..9b53bc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = ect
-	pkgdesc = file compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files.
-	pkgver = 0.9.4
-	pkgrel = 1
-	url = https://github.com/fhanau/Efficient-Compression-Tool
-	arch = i686
+	pkgdesc = File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files
+	pkgver = 0.9.5
+	pkgrel = 3
+	url = https://github.com/fhanau/efficient-compression-tool
 	arch = x86_64
-	license = Apache
+	license = Apache-2.0
 	makedepends = nasm
 	makedepends = git
 	makedepends = cmake
 	depends = gcc-libs
-	source = git+https://github.com/fhanau/Efficient-Compression-Tool.git#commit=503409a4de166ad1544adcb5d4e48fef308a2727
-	md5sums = SKIP
+	source = git+https://github.com/fhanau/efficient-compression-tool.git#tag=v0.9.5
+	source = git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551
+	source = git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49
+	sha512sums = a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc
+	sha512sums = 13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f
+	sha512sums = 1bdd9efa8d9c49a16cf5f2135ed29dc120bc1b31eec7130802d22b3d09bf10fe337f734b39b38e422bbe6e1719aca6744d49e2b435c2cb94cbf401d89086947a
 
 pkgname = ect
diff --git a/PKGBUILD b/PKGBUILD
index 9b16335..adb0d79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,42 @@
+# Maintainer: Manuel Hüsers <aur@huesers.de>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: William J. Bowman <aur@williamjbowman.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=ect
-_pkgname=Efficient-Compression-Tool
-pkgver=0.9.4
-pkgrel=1
-pkgdesc='file compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files.'
-url='https://github.com/fhanau/Efficient-Compression-Tool'
-arch=('i686' 'x86_64')
-license=('Apache')
-source=("git+$url.git#commit=503409a4de166ad1544adcb5d4e48fef308a2727")
-md5sums=('SKIP')
+_pkgname=efficient-compression-tool
+pkgver=0.9.5
+pkgrel=3
+pkgdesc='File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files'
+url="https://github.com/fhanau/$_pkgname"
+arch=('x86_64')
+license=('Apache-2.0')
 depends=('gcc-libs')
 makedepends=('nasm' 'git' 'cmake')
+source=("git+$url.git#tag=v$pkgver"
+	'git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551'
+	'git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49')
+sha512sums=('a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc'
+            '13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f'
+            '1bdd9efa8d9c49a16cf5f2135ed29dc120bc1b31eec7130802d22b3d09bf10fe337f734b39b38e422bbe6e1719aca6744d49e2b435c2cb94cbf401d89086947a')
 
 prepare() {
-  cd ${_pkgname}
-  git submodule init 
-  git submodule update --init --recursive --recommend-shallow
+	cd "$_pkgname"
+	git submodule init
+	git config submodule.src/libpng.url "$srcdir"/libpng
+	git config submodule.src/mozjpeg.url "$srcdir"/mozjpeg
+	git -c protocol.file.allow=always submodule update
 }
 
 build() {
-  cd ${_pkgname}
-  [ -d build ] || mkdir build
-  cd build
-  cmake -DECT_FOLDER_SUPPORT=off ../src
-  make
+	cmake -B build -S "$_pkgname"/src \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5
+	cmake --build build
 }
 
 package() {
-  cd ${_pkgname}/build
-  install -Dm755 ect "$pkgdir"/usr/bin/ect 
-  cd "${pkgdir}"/usr/bin
-
-  # Some things expect this to be an all-caps name
-  ln -s ect ECT
+	DESTDIR="$pkgdir" cmake --install build
+	# Some things expect this to be an all-caps name
+	ln -s ect "$pkgdir"/usr/bin/ECT
 }