diff --git a/community/ympd/APKBUILD b/community/ympd/APKBUILD
index 140934704d441bb58bd1b0b346c55e0270d039b8..812101c5562cc6a7f87d70fb8a986e759e6b7c20 100644
--- a/community/ympd/APKBUILD
+++ b/community/ympd/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ympd
 pkgver=1.3.0
-pkgrel=11
+pkgrel=12
 pkgdesc="A standalone MPD Web GUI"
 url="https://www.ympd.org/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="cmake libmpdclient-dev openssl-dev>3"
+makedepends="cmake libmpdclient-dev openssl-dev>3 samurai"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="ympd-$pkgver.tar.gz::https://github.com/notandy/ympd/archive/v$pkgver.tar.gz
@@ -17,23 +17,23 @@ source="ympd-$pkgver.tar.gz::https://github.com/notandy/ympd/archive/v$pkgver.ta
 	"
 
 build() {
-	# Upstream has fixes in a pull request but is not merged yet
-	CFLAGS="$CFLAGS -fcommon"
-	cmake -B build . \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=None
-	make -C build
+	cmake --build build
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir/" install
+	DESTDIR="$pkgdir" cmake --install build
 	install -D -m755 "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd \
 		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="7e2bd4124b0e7692e2528e9fc50955d1b357ba042d8c97941160ad31ee0c89bc53b349195b45d27ce77aaa954bc01aceba1a30cdb89d9f58644a0b4934498a16  ympd-1.3.0.tar.gz
+sha512sums="
+7e2bd4124b0e7692e2528e9fc50955d1b357ba042d8c97941160ad31ee0c89bc53b349195b45d27ce77aaa954bc01aceba1a30cdb89d9f58644a0b4934498a16  ympd-1.3.0.tar.gz
 56204dc84cbc1523584899ab9e3aa65e00526aea10b4422ed47bdd31f8c093af768225e3e7329d5ac42f37317e24198e9799a909c55469e0835acd9e04e0387b  ympd.initd
 54c227d7dbb9c0eba8e785964f142b64fb5c32de562471acc7050b016d81d2f6f32f6802261a4e3de33836468122ad2197e0034af2ebb3799b02f24c44e7bab8  ympd.confd
-9e8898ac22e383873bc7d05db112a8d0b6c154ad8ee30022a3e2af6d875526bc718e12943557f3059f936ad2cd0f73240f0103c1617ca859ad0000cb9e03e274  gcc-10.patch"
+9e8898ac22e383873bc7d05db112a8d0b6c154ad8ee30022a3e2af6d875526bc718e12943557f3059f936ad2cd0f73240f0103c1617ca859ad0000cb9e03e274  gcc-10.patch
+"