diff --git a/media-sound/mpd/mpd-0.20.15.recipe b/media-sound/mpd/mpd-0.20.16.recipe
similarity index 90%
rename from media-sound/mpd/mpd-0.20.15.recipe
rename to media-sound/mpd/mpd-0.20.16.recipe
index a86f8aa92..76c280b7d 100644
--- a/media-sound/mpd/mpd-0.20.15.recipe
+++ b/media-sound/mpd/mpd-0.20.16.recipe
@@ -7,15 +7,23 @@ COPYRIGHT="2003-2017 The Music Player Daemon Project"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.musicpd.org/download/mpd/0.20/mpd-$portVersion.tar.xz"
-CHECKSUM_SHA256="c69c4f67e665380ea3bbde6cff8958edc85f7cd40e7918ae5ce0a2184ca9eb40"
+CHECKSUM_SHA256="29e1676288e61a8bee6b687d23ba6ca42ccec4dc87c6a0e81d119aea27dcd06a"
 PATCHES="mpd-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	mpd$secondaryArchSuffix = $portVersion
-	cmd:mpd$secondaryArchSuffix = $portVersion
+	cmd:mpd$commandSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -145,9 +153,12 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
+defineDebugInfoPackage mpd$secondaryArchSuffix \
+	"$commandBinDir"/mpd
+
 BUILD()
 {
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 
 	make $jobArgs
 }
@@ -156,3 +167,8 @@ INSTALL()
 {
 	make install
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-sound/mpd/patches/mpd-0.20.15.patchset b/media-sound/mpd/patches/mpd-0.20.16.patchset
similarity index 100%
rename from media-sound/mpd/patches/mpd-0.20.15.patchset
rename to media-sound/mpd/patches/mpd-0.20.16.patchset