diff --git a/main/herbstluftwm/APKBUILD b/main/herbstluftwm/APKBUILD
index c87e3efecdb10e674630039ac54061f582bb2046..e299b0659d635e1a1202aff6a828cffda1fa1a6f 100644
--- a/main/herbstluftwm/APKBUILD
+++ b/main/herbstluftwm/APKBUILD
@@ -15,6 +15,7 @@ install=""
 subpackages="
 	$pkgname-doc
 	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-fish-completion:fishcomp:noarch
 	$pkgname-zsh-completion:zshcomp:noarch
 	"
 source="https://herbstluftwm.org/tarballs/$pkgname-$pkgver.tar.gz
@@ -48,6 +49,16 @@ bashcomp() {
 	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
 }
 
+fishcomp() {
+	pkgdesc="Fish completion for $pkgname"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel fish"
+
+	mkdir -p "$subpkgdir"/usr/share/fish/completions/
+	mv "$pkgdir"/usr/share/fish/vendor_completions.d/*.fish \
+		"$subpkgdir"/usr/share/fish/completions/
+}
+
 zshcomp() {
 	pkgdesc="Zsh completion for $pkgname"
 	depends=""