diff --git a/media-sound/wavpack/wavpack-5.0.0.recipe b/media-sound/wavpack/wavpack-5.1.0.recipe
similarity index 72%
rename from media-sound/wavpack/wavpack-5.0.0.recipe
rename to media-sound/wavpack/wavpack-5.1.0.recipe
index 0d13c65a5..709ff2b1a 100644
--- a/media-sound/wavpack/wavpack-5.0.0.recipe
+++ b/media-sound/wavpack/wavpack-5.1.0.recipe
@@ -2,30 +2,41 @@ SUMMARY="Hybrid lossless audio compression format & tools"
 DESCRIPTION="WavPack is a completely open audio compression format, providing \
 lossless, high-quality lossy, and a unique hybrid compression mode."
 HOMEPAGE="http://wavpack.com/"
-COPYRIGHT="1998-2016 David Bryant"
+COPYRIGHT="1998-2017 David Bryant"
 LICENSE="WavPack"
 REVISION="1"
 SOURCE_URI="http://wavpack.com/wavpack-$portVersion.tar.bz2"
-CHECKSUM_SHA256="918d7e32a19598df543b17fff840b10a0880f87296f9e32af454d256b6a64049"
+CHECKSUM_SHA256="1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandSuffix=$secondaryArchSuffix
 	commandBinDir=$binDir
 else
+	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
 	wavpack$secondaryArchSuffix = $portVersion
 	lib:libwavpack$secondaryArchSuffix = 1.2.0 compat >= 1
-	cmd:wavpack = $portVersion
-	cmd:wvgain = $portVersion
-	cmd:wvunpack = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_bin="
+	wavpack${secondaryArchSuffix}_bin = $portVersion
+	cmd:wavpack$commandSuffix = $portVersion
+	cmd:wvgain$commandSuffix = $portVersion
+	cmd:wvtag$commandSuffix = $portVersion
+	cmd:wvunpack$commandSuffix = $portVersion
+	"
+REQUIRES_bin="
+	haiku$secondaryArchSuffix
+	wavpack$secondaryArchSuffix == $portVersion base
 	lib:libiconv$secondaryArchSuffix
 	"
 
@@ -78,7 +89,12 @@ INSTALL()
 	prepareInstalledDevelLib libwavpack
 	fixPkgconfig
 
-	packageEntries devel $developDir
+	packageEntries bin \
+		$commandBinDir \
+		$manDir
+
+	packageEntries devel \
+		$developDir
 }
 
 TEST()