diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe
deleted file mode 100644
index e8dafb180..000000000
--- a/media-libs/bpg/bpg-0.9.4.recipe
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY="Tools and library for the Better Prortable Graphics format"
-DESCRIPTION="BPG is an image format based on the HEVC standard that aims to \
-provide a replacement for the JPEG format with better quality and smaller file\
- size."
-HOMEPAGE="https://bellard.org/bpg/"
-COPYRIGHT="2014 Fabrice Bellard"
-LICENSE="MIT
-	GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="http://bellard.org/bpg/libbpg-0.9.4.tar.gz"
-CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2a"
-SOURCE_DIR="libbpg-$portVersion"
-
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	bpg$secondaryArchSuffix = $portVersion
-	cmd:bpgdec$secondaryArchSuffix
-	cmd:bpgenc$secondaryArchSuffix
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	bpg${secondaryArchSuffix}_devel = $portVersion
-	devel:libbpg$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	sed -i 's/-lpthread//g' Makefile
-	sed -i 's/-lm//g' Makefile
-	sed -i 's/-lrt//g' Makefile
-	make
-}
-
-INSTALL()
-{
-	mkdir -p $binDir
-
-	sed -i "s,\$(prefix)/bin,$binDir,g" Makefile
-	make install
-
-	mkdir -p $libDir
-	cp libbpg.a $libDir
-	prepareInstalledDevelLib libbpg
-	packageEntries devel $developLibDir
-}
diff --git a/media-libs/libbpg/libbpg-0.9.8.recipe b/media-libs/libbpg/libbpg-0.9.8.recipe
new file mode 100644
index 000000000..b540ac2ec
--- /dev/null
+++ b/media-libs/libbpg/libbpg-0.9.8.recipe
@@ -0,0 +1,87 @@
+SUMMARY="Tools and library for the Better Prortable Graphics format"
+DESCRIPTION="BPG is an image format based on the HEVC standard that aims to \
+provide a replacement for the JPEG format with better quality and smaller file\
+ size."
+HOMEPAGE="https://bellard.org/bpg/"
+COPYRIGHT="2014-2018 Fabrice Bellard"
+LICENSE="MIT
+	GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="http://bellard.org/bpg/libbpg-$portVersion.tar.gz"
+CHECKSUM_SHA256="c0788e23bdf1a7d36cb4424ccb2fae4c7789ac94949563c4ad0e2569d3bf0095"
+
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libbpg$secondaryArchSuffix = $portVersion
+	cmd:bpgdec$secondaryArchSuffix
+	cmd:bpgenc$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	"
+REPLACES="
+	bpg$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libbpg${secondaryArchSuffix}_devel = $portVersion
+	devel:libbpg$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	"
+REPLACES_devel="
+	bpg${secondaryArchSuffix}_devel
+	"
+
+SUMMARY_tools="A small utility to view image files"
+PROVIDES_tools="
+	libbpg_tools$secondaryArchSuffix
+	cmd:bpgview$secondaryArchSuffix
+	"
+REQUIRES_tools="
+	haiku$secondaryArchSuffix
+	lib:libSDL$secondaryArchSuffix
+	lib:libSDL_image$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libSDL_image$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+PATCH()
+{
+	sed -i 's/USE_X265=y/#USE_X265=y/g' Makefile
+	sed -i 's/-lrt//g' Makefile
+	sed -i "s,\$(prefix)/bin,$binDir,g" Makefile
+}
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir $developLibDir $documentationDir $includeDir
+	cp {bpgenc,bpgdec,bpgview} $binDir
+	cp libbpg.a $developLibDir
+	cp doc/bpg_spec.txt $documentationDir
+	cp {libbpg.h,bpgenc.h} $includeDir
+
+	packageEntries devel \
+		$developDir
+	packageEntries tools \
+		$binDir/bpgview
+}