diff --git a/media-libs/libavif/libavif9-0.8.4.recipe b/media-libs/libavif/libavif1.0-1.0.1.recipe
similarity index 55%
rename from media-libs/libavif/libavif9-0.8.4.recipe
rename to media-libs/libavif/libavif1.0-1.0.1.recipe
index a9cfec5fe..1cc1b92c5 100644
--- a/media-libs/libavif/libavif9-0.8.4.recipe
+++ b/media-libs/libavif/libavif1.0-1.0.1.recipe
@@ -12,17 +12,17 @@ COPYRIGHT="2019 Joe Drago"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/AOMediaCodec/libavif/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="116b46a9a497c6ef178c5a20b912d8ac02f888dc8c537e40b5d16700823a9b16"
+CHECKSUM_SHA256="398fe7039ce35db80fe7da8d116035924f2c02ea4a4aa9f4903df6699287599c"
 SOURCE_DIR="libavif-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2 ?x86 ?arm ?riscv64 ?sparc ?m68k"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="9.0.0"
+libVersion="16.0.1"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	libavif9$secondaryArchSuffix = $portVersion
+	libavif1.0$secondaryArchSuffix = $portVersion
 	lib:libavif$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -30,9 +30,37 @@ REQUIRES="
 	lib:libdav1d$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	libavif1.0${secondaryArchSuffix}_devel = $portVersion
+	devel:libavif$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libavif1.0$secondaryArchSuffix == $portVersion base
+	devel:libdav1d$secondaryArchSuffix
+	"
+CONFLICTS_devel="
+	libavif${secondaryArchSuffix}_devel
+	"
+
+PROVIDES_tools="
+	libavif1.0${secondaryArchSuffix}_tools = $portVersion
+	cmd:avifenc$secondaryArchSuffix
+	cmd:avifdec$secondaryArchSuffix
+	"
+REQUIRES_tools="
+	libavif1.0$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	"
+CONFLICTS_tools="
+	libavif${secondaryArchSuffix}_tools
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libdav1d$secondaryArchSuffix >= 5
+	devel:libdav1d$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
@@ -43,15 +71,17 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage libavif1.0$secondaryArchSuffix \
+	"$libDir"/libavif.so.$libVersion
+
 BUILD()
 {
-	mkdir -p build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DAVIF_BUILD_APPS=ON \
 		-DAVIF_CODEC_DAV1D=ON \
 		$cmakeDirArgs
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
@@ -60,6 +90,11 @@ INSTALL()
 
 	prepareInstalledDevelLib libavif
 	fixPkgconfig
-	rm -rf $developDir
-	rm -rf $binDir
+
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+
+	packageEntries tools \
+		$binDir
 }