diff --git a/community/cmus/APKBUILD b/community/cmus/APKBUILD
index d7992921820dac30e96b4bf14f7d78fa38a31928..752169a442029bc31795d5703dcf320aaeb810c5 100644
--- a/community/cmus/APKBUILD
+++ b/community/cmus/APKBUILD
@@ -3,23 +3,38 @@
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 pkgname=cmus
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="feature-rich ncurses-based music player"
 url="https://cmus.github.io/"
 arch="all"
 license="GPL-2.0-or-later"
 options="!check" # No test suite
-makedepends="alsa-lib-dev faad2-dev flac-dev libmad-dev opusfile-dev
-	libogg-dev libvorbis-dev ncurses-dev wavpack-dev ffmpeg-dev
-	linux-headers elogind-dev"
-subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch"
+makedepends="
+	alsa-lib-dev
+	elogind-dev
+	faad2-dev
+	ffmpeg-dev
+	flac-dev
+	libmad-dev
+	libogg-dev
+	libvorbis-dev
+	linux-headers
+	ncurses-dev
+	opusfile-dev
+	wavpack-dev
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-zsh-completion
+	$pkgname-bash-completion
+	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/cmus/cmus/archive/v$pkgver.tar.gz
 	c11-atomics-check.patch
 	1172.patch
 	"
 
 build() {
+	export CFLAGS="$CFLAGS -flto=auto"
 	./configure prefix=/usr
 	make
 }
@@ -27,27 +42,12 @@ build() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	for file in AUTHORS README.md; do
-		install -Dm644 "$file" "$pkgdir"/usr/share/doc/$pkgname/
-	done
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	install -Dm644 "$builddir"/contrib/$pkgname.bash-completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
-}
-
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
+	install -Dm644 AUTHORS README.md -t "$pkgdir"/usr/share/doc/$pkgname/
 
-	install -Dm644 "$builddir"/contrib/_$pkgname \
-		"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
+	install -Dm644 contrib/$pkgname.bash-completion \
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
+	install -Dm644 contrib/_$pkgname \
+		"$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
 sha512sums="