diff --git a/media-libs/libmpdclient/libmpdclient-2.18.recipe b/media-libs/libmpdclient/libmpdclient-2.18.recipe
index 12cee7850..af04263e6 100644
--- a/media-libs/libmpdclient/libmpdclient-2.18.recipe
+++ b/media-libs/libmpdclient/libmpdclient-2.18.recipe
@@ -5,7 +5,7 @@ of sound files while being controlled by its network protocol."
 HOMEPAGE="https://www.musicpd.org/"
 COPYRIGHT="2003-2020 The Music Player Daemon Project"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/MusicPlayerDaemon/libmpdclient/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="9b97d00022f2053c06d87bff40b319dfab930ee2b5fa9b8dec208a2911ca3efc"
 SOURCE_FILENAME="libmpdclient-$portVersion.tar.gz"
@@ -52,31 +52,23 @@ defineDebugInfoPackage libmpdclient$secondaryArchSuffix \
 
 BUILD()
 {
-	rm -rf build_haiku
-	mkdir -p build_haiku; cd build_haiku
-
 	export LDFLAGS="-lnetwork"
-	meson --prefix=$prefix \
+	meson build --buildtype=release \
+		--prefix=$prefix \
 		--libdir=$libDir \
 		--includedir=$includeDir \
 		--mandir=$manDir \
 		--infodir=$infoDir \
 		-Dtest=true
-
-	ninja $jobArgs
+	ninja -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build_haiku
-	ninja install
-
-	mkdir -p $docDir
-	mv $prefix/share/doc/libmpdclient/* $docDir
-	rm -rf $prefix/share
+	ninja -C build install
 
 	# prepare devel/lib
-	prepareInstalledDevelLibs libmpdclient
+	prepareInstalledDevelLib libmpdclient
 	fixPkgconfig
 
 	# devel package
@@ -86,6 +78,5 @@ INSTALL()
 
 TEST()
 {
-	cd build_haiku
-	ninja test
+	ninja -C build test
 }