diff --git a/media-sound/mpc/musicpc-0.28.recipe b/media-sound/mpc/musicpc-0.30.recipe
similarity index 53%
rename from media-sound/mpc/musicpc-0.28.recipe
rename to media-sound/mpc/musicpc-0.30.recipe
index b958a90c0..6841abdde 100644
--- a/media-sound/mpc/musicpc-0.28.recipe
+++ b/media-sound/mpc/musicpc-0.30.recipe
@@ -1,16 +1,15 @@
 SUMMARY="A commandline client for Music Player Daemon"
-DESCRIPTION="
-Music Player Daemon (MPD) is a flexible, powerful, server-side application \
-for playing music. Through plugins and libraries it can play a variety \
-of sound files while being controlled by its network protocol.
+DESCRIPTION="Music Player Daemon (MPD) is a flexible, powerful, server-side \
+application for playing music. Through plugins and libraries it can play a \
+variety of sound files while being controlled by its network protocol.
 
 MPC is a commandline client for Music Player Daemon."
 HOMEPAGE="https://www.musicpd.org/"
-COPYRIGHT="2003-2014 The Music Player Daemon Project"
+COPYRIGHT="2003-2018 The Music Player Daemon Project"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://www.musicpd.org/download/mpc/0/mpc-$portVersion.tar.xz"
-CHECKSUM_SHA256="a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547"
+CHECKSUM_SHA256="65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce"
 SOURCE_DIR="mpc-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
@@ -24,36 +23,59 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	glib2$secondaryArchSuffix >= 2
 	lib:libmpdclient$secondaryArchSuffix
-#	lib:libiconv$secondaryArchSuffix # not found
+	lib:libiconv$secondaryArchSuffix # not found
 #	lib:libintl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	glib2${secondaryArchSuffix}_devel
+	devel:libcheck$secondaryArchSuffix
 	devel:libmpdclient$secondaryArchSuffix
 #	devel:libiconv$secondaryArchSuffix
 #	devel:libintl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:meson
+	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:ranlib$secondaryArchSuffix
 	cmd:sed
-	cmd:find
 	"
 
 BUILD()
 {
-	runConfigure ./configure
+	rm -rf build_haiku
+	mkdir -p build_haiku; cd build_haiku
 
-	make $jobArgs
+	export LDFLAGS="-lnetwork"
+
+	meson --prefix=$prefix \
+		--libdir=$libDir \
+		--includedir=$includeDir \
+		--mandir=$manDir \
+		--infodir=$infoDir \
+		-Dtest=true
+
+	ninja $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	cd build_haiku
+	ninja install
+
+	mkdir -p $docDir
+	mv $prefix/share/doc/mpc $docDir
+	rm -rf $prefix/share
+}
+
+TEST()
+{
+	cd build_haiku
+	ninja test
 }