diff --git a/community/abook/APKBUILD b/community/abook/APKBUILD
index d357cc1f8ff42413b63ca1ce6e7bf828d884ff36..2f641d4d37b7a6d546dabc696c17badea2fdf699 100644
--- a/community/abook/APKBUILD
+++ b/community/abook/APKBUILD
@@ -6,7 +6,7 @@ _ver=${pkgver/_pre/pre}
 pkgrel=5
 pkgdesc="Text-based addressbook designed for use with Mutt"
 url="http://abook.sourceforge.net"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 arch="all"
 makedepends="ncurses-dev readline-dev automake autoconf gettext-dev"
 subpackages="$pkgname-doc $pkgname-lang"
@@ -15,30 +15,24 @@ source="http://$pkgname.sourceforge.net/devel/$pkgname-${_ver}.tar.gz
 
 builddir="$srcdir"/$pkgname-$_ver
 prepare() {
-	default_prepare || return 1
-	cd "$builddir"
-
+	default_prepare
 	aclocal && automake --add-missing && autoconf -v
 	sed 's/0.18/0.20/g' -i po/Makefile.in.in
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/charset.alias
+	make DESTDIR="$pkgdir" install
 }
 
 md5sums="4bffd4c47ac41b688abd58f65bfe0bfb  abook-0.6.1.tar.gz