diff --git a/community/yubico-c/APKBUILD b/community/yubico-c/APKBUILD
index 8921212dbc5620574c015f7a28ad8979c2170015..6fe6efffc8fc9cf8e81dd050b69070fceed87026 100644
--- a/community/yubico-c/APKBUILD
+++ b/community/yubico-c/APKBUILD
@@ -13,12 +13,12 @@ builddir="$srcdir/libyubikey-$pkgver"
 
 prepare() {
 	default_prepare
+
 	update_config_guess
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,20 +30,17 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 tools() {
 	pkgdesc="$pkgdesc (CLI tools)"
 
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
 sha512sums="28f45cb9817c30a70d168ae507d3f8014051058d730eed92b31d92e96784138dea291bda4275511c5f92a6427cb4249d76c802b8abb867cec50e62fb770950f2  libyubikey-1.13.tar.gz"