diff --git a/main/abootimg/APKBUILD b/main/abootimg/APKBUILD
index 17d813508..bf3418bfa 100644
--- a/main/abootimg/APKBUILD
+++ b/main/abootimg/APKBUILD
@@ -1,42 +1,40 @@
-_commit="1ebeb393252ab5aeed62e34bc439b6728444f06e"
-
 pkgname=abootimg
 pkgver=0.6_git20150325
-pkgrel=0
-arch="all"
-license="GPL2"
+_commit="1ebeb393252ab5aeed62e34bc439b6728444f06e"
+pkgrel=1
 pkgdesc="A tool to read/write/update android boot images"
 url="https://gitlab.com/ajs124/abootimg"
-depends=""
+arch="all"
+license="GPL-2.0-or-later"
 makedepends="linux-headers util-linux-dev"
 subpackages="$pkgname-doc"
-source="${pkgname}-${_commit}.tar.bz2::https://gitlab.com/ajs124/${pkgname}/repository/${_commit}/archive.tar.bz2"
-options="!check"
-
-builddir="${srcdir}/abootimg-${_commit}-${_commit}"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/ajs124/abootimg/-/archive/$_commit/abootimg-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+options="!check" # no test suite
 
 prepare() {
+	default_prepare
+
 	# Makefile tries to run git otherwise
 	echo "#define VERSION_STR \"$pkgver-$_commit\"" > "$builddir"/version.h
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
-	install -Dm755 "${builddir}/abootimg" "${pkgdir}/usr/bin/abootimg"
-	install -Dm755 "${builddir}/abootimg-pack-initrd" "${pkgdir}/usr/bin/abootimg-pack-initrd"
-	install -Dm755 "${builddir}/abootimg-unpack-initrd" "${pkgdir}/usr/bin/abootimg-unpack-initrd"
+	install -Dm755 abootimg "$pkgdir"/usr/bin/abootimg
+	install -Dm755 abootimg-pack-initrd "$pkgdir"/usr/bin/abootimg-pack-initrd
+	install -Dm755 abootimg-unpack-initrd "$pkgdir"/usr/bin/abootimg-unpack-initrd
 }
 
 doc() {
-	gzip "$builddir"/debian/abootimg.1
-	install -Dm644 "$builddir"/debian/abootimg.1.gz \
+	cd "$builddir"
+	gzip debian/abootimg.1
+	install -Dm644 debian/abootimg.1.gz \
 		"$subpkgdir"/usr/share/man/man1/abootimg.1.gz
 }
 
 
-sha512sums="8b281d48ad33873ecdc95fdaecb0efee62377d06671dfb1ee2c5cd58edf41e39a1639c74e786ca9490938875ef334161a3a3a29b34412ee479f8786e9bb1bf2e  abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e.tar.bz2"
+sha512sums="224157ca7af4b9a8bde8e33dcbccd7df5a9dbf2ca9be7c2ad60f41cebd5cbb0d796b96da9a17dea29c97a8909cf3fe265dea6e849dc229bc99c4f68909213141  abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e.tar.gz"