diff --git a/media-libs/libwebp/libwebp-0.5.0.recipe b/media-libs/libwebp/libwebp-0.5.0.recipe
new file mode 100644
index 000000000..eabe1fbce
--- /dev/null
+++ b/media-libs/libwebp/libwebp-0.5.0.recipe
@@ -0,0 +1,96 @@
+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="5cd3bb7b623aff1f4e70bd611dc8dbabbf7688fd5eb225b32e02e09e37dfb274"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libwebp$secondaryArchSuffix = $portVersion compat >= 0.5
+	lib:libwebp$secondaryArchSuffix = 6.0.0 compat >= 6
+	lib:libwebpdecoder$secondaryArchSuffix = 2.0.0 compat >= 2
+	lib:libwebpdemux$secondaryArchSuffix = 2.0.0 compat >= 2
+	lib:libwebpextras$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:libwebpmux$secondaryArchSuffix = 2.0.0 compat >= 2
+	cmd:cwebp$secondaryArchSuffix
+	cmd:dwebp$secondaryArchSuffix
+	cmd:gif2webp$secondaryArchSuffix
+	cmd:webpmux$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.5
+	devel:libwebp$secondaryArchSuffix = 6.0.0 compat >= 6
+	devel:libwebpdecoder$secondaryArchSuffix = 2.0.0 compat >= 2
+	devel:libwebpdemux$secondaryArchSuffix = 2.0.0 compat >= 2
+	devel:libwebpextras$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:libwebpmux$secondaryArchSuffix = 2.0.0 compat >= 2
+	"
+REQUIRES_devel="
+	libwebp$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libwebp5${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libjpeg$secondaryArchSuffix
+	devel:libgif$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	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-libwebpextras --enable-swap-16bit-csp --disable-static
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	rm -f $libDir/*.la
+
+	prepareInstalledDevelLibs libwebp libwebpdecoder libwebpdemux \
+		libwebpextras libwebpmux
+	fixPkgconfig
+
+	#devel package
+	packageEntries devel \
+		$developDir
+}
diff --git a/media-libs/libwebp/libwebp-0.4.4.recipe b/media-libs/libwebp/libwebp5-0.4.4.recipe
similarity index 86%
rename from media-libs/libwebp/libwebp-0.4.4.recipe
rename to media-libs/libwebp/libwebp5-0.4.4.recipe
index 223eeb333..1a758512d 100644
--- a/media-libs/libwebp/libwebp-0.4.4.recipe
+++ b/media-libs/libwebp/libwebp5-0.4.4.recipe
@@ -14,15 +14,14 @@ LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="http://downloads.webmproject.org/releases/webp/libwebp-$portVersion.tar.gz"
 CHECKSUM_SHA256="c65d34edb57338e331ba4d622227a2b3179444cfca17d02c34f1ead63f603e86"
+SOURCE_DIR="libwebp-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libwebp$secondaryArchSuffix = $portVersion compat >= 0.4
+	libwebp5$secondaryArchSuffix = $portVersion compat >= 0.4
 	lib:libwebp$secondaryArchSuffix = 5.0.4 compat >= 5
-	cmd:cwebp$secondaryArchSuffix
-	cmd:dwebp$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,11 +32,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.4
+	libwebp5${secondaryArchSuffix}_devel = $portVersion compat >= 0.4
 	devel:libwebp$secondaryArchSuffix = 5.0.4 compat >= 5
 	"
 REQUIRES_devel="
-	libwebp$secondaryArchSuffix == $portVersion base
+	libwebp5$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -61,13 +60,15 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	./autogen.sh
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	
+	rm -rf $binDir $manDir $libDir/*.la
 
 	prepareInstalledDevelLibs libwebp
 	fixPkgconfig