diff --git a/media-libs/libwebp/libwebp-0.6.0.recipe b/media-libs/libwebp/libwebp-0.6.0.recipe
new file mode 100644
index 000000000..e2879c580
--- /dev/null
+++ b/media-libs/libwebp/libwebp-0.6.0.recipe
@@ -0,0 +1,103 @@
+SUMMARY="A library for encoding and decoding WebP image files"
+DESCRIPTION="WebP is an image format that provides lossless and lossy \
+compression for images on the web. WebP lossless images are 26% smaller \
+in size compared to PNGs. WebP lossy images are 25-34% smaller in size \
+compared to JPEG images at equivalent SSIM index.
+WebP supports lossless transparency (also known as alpha channel) with \
+just 22% additional bytes. Transparency is also supported with lossy \
+compression and typically provides 3x smaller file sizes compared to \
+PNG when lossy compression is acceptable for the red/green/blue color \
+channels."
+HOMEPAGE="https://developers.google.com/speed/webp"
+COPYRIGHT="2011 Google Inc."
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="http://downloads.webmproject.org/releases/webp/libwebp-$portVersion.tar.gz"
+CHECKSUM_SHA256="c928119229d4f8f35e20113ffb61f281eda267634a8dc2285af4b0ee27cf2b40"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libwebp$secondaryArchSuffix = $portVersion compat >= 0.6
+	lib:libwebp$secondaryArchSuffix = 7.0.0 compat >= 7
+	lib:libwebpdecoder$secondaryArchSuffix = 3.0.0 compat >= 3
+	lib:libwebpdemux$secondaryArchSuffix = 2.0.2 compat >= 2
+	lib:libwebpmux$secondaryArchSuffix = 3.0.2 compat >= 3
+	cmd:cwebp$secondaryArchSuffix
+	cmd:dwebp$secondaryArchSuffix
+	cmd:gif2webp$secondaryArchSuffix
+	cmd:img2webp$secondaryArchSuffix
+	cmd:webpmux$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.6
+	devel:libwebp$secondaryArchSuffix = 7.0.2 compat >= 7
+	devel:libwebpdecoder$secondaryArchSuffix = 3.0.0 compat >= 3
+	devel:libwebpdemux$secondaryArchSuffix = 2.0.2 compat >= 2
+	devel:libwebpmux$secondaryArchSuffix = 3.0.0 compat >= 3
+	"
+REQUIRES_devel="
+	libwebp$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libwebp5${secondaryArchSuffix}_devel
+	libwebp6${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libjpeg$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix >= 5
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:m4
+	cmd:find
+	"
+
+BUILD()
+{
+	./autogen.sh
+	runConfigure ./configure \
+		--enable-libwebpdemux --enable-libwebpmux --enable-libwebpdecoder \
+		--enable-swap-16bit-csp --disable-static
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	rm -f $libDir/*.la
+
+	prepareInstalledDevelLibs libwebp libwebpdecoder libwebpdemux \
+		libwebpmux
+	fixPkgconfig
+
+	#devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
diff --git a/media-libs/libwebp/libwebp-0.5.2.recipe b/media-libs/libwebp/libwebp6-0.5.2.recipe
similarity index 80%
rename from media-libs/libwebp/libwebp-0.5.2.recipe
rename to media-libs/libwebp/libwebp6-0.5.2.recipe
index 6ff401b25..1c75b193f 100644
--- a/media-libs/libwebp/libwebp-0.5.2.recipe
+++ b/media-libs/libwebp/libwebp6-0.5.2.recipe
@@ -14,21 +14,17 @@ LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="http://downloads.webmproject.org/releases/webp/libwebp-$portVersion.tar.gz"
 CHECKSUM_SHA256="b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef"
+SOURCE_DIR="libwebp-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libwebp$secondaryArchSuffix = $portVersion compat >= 0.5
+	libwebp6$secondaryArchSuffix = $portVersion compat >= 0.5
 	lib:libwebp$secondaryArchSuffix = 6.0.2 compat >= 6
 	lib:libwebpdecoder$secondaryArchSuffix = 2.0.2 compat >= 2
-	lib:libwebpdemux$secondaryArchSuffix = 2.0.1 compat >= 2
 	lib:libwebpextras$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:libwebpmux$secondaryArchSuffix = 2.0.2 compat >= 2
-	cmd:cwebp$secondaryArchSuffix
-	cmd:dwebp$secondaryArchSuffix
-	cmd:gif2webp$secondaryArchSuffix
-	cmd:webpmux$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -39,15 +35,14 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
+	libwebp6${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
 	devel:libwebp$secondaryArchSuffix = 6.0.2 compat >= 6
 	devel:libwebpdecoder$secondaryArchSuffix = 2.0.2 compat >= 2
-	devel:libwebpdemux$secondaryArchSuffix = 2.0.1 compat >= 2
 	devel:libwebpextras$secondaryArchSuffix = 0.0.0 compat >= 0
 	devel:libwebpmux$secondaryArchSuffix = 2.0.2 compat >= 2
 	"
 REQUIRES_devel="
-	libwebp$secondaryArchSuffix == $portVersion base
+	libwebp6$secondaryArchSuffix == $portVersion base
 	"
 CONFLICTS_devel="
 	libwebp5${secondaryArchSuffix}_devel
@@ -75,7 +70,7 @@ BUILD()
 {
 	./autogen.sh
 	runConfigure ./configure \
-		--enable-libwebpdemux --enable-libwebpmux --enable-libwebpdecoder \
+		--enable-libwebpmux --enable-libwebpdecoder \
 		--enable-libwebpextras --enable-swap-16bit-csp --disable-static
 	make $jobArgs
 }
@@ -84,9 +79,9 @@ INSTALL()
 {
 	make install
 	
-	rm -f $libDir/*.la
+	rm -rf $binDir $manDir $libDir/*.la
 
-	prepareInstalledDevelLibs libwebp libwebpdecoder libwebpdemux \
+	prepareInstalledDevelLibs libwebp libwebpdecoder \
 		libwebpextras libwebpmux
 	fixPkgconfig