diff --git a/dev-libs/orcus/orcus-0.17.2.recipe b/dev-libs/orcus/orcus0.20-0.20.2.recipe
similarity index 83%
rename from dev-libs/orcus/orcus-0.17.2.recipe
rename to dev-libs/orcus/orcus0.20-0.20.2.recipe
index 2c6b922e3..20a24d6b4 100644
--- a/dev-libs/orcus/orcus-0.17.2.recipe
+++ b/dev-libs/orcus/orcus0.20-0.20.2.recipe
@@ -3,16 +3,17 @@ DESCRIPTION="Orcus is a library that provides a collection of standalone file \
 processing filters. It is currently focused on providing filters for \
 spreadsheet documents."
 HOMEPAGE="https://gitlab.com/orcus/orcus"
-COPYRIGHT="Kohei Yoshida et al."
+COPYRIGHT="2022 Kohei Yoshida et al."
 LICENSE="MPL v2.0"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://gitlab.com/orcus/orcus/-/archive/$portVersion/orcus-$portVersion.tar.bz2"
-CHECKSUM_SHA256="79fcc2998191fe5853a05edafe97a04d73e45d95d38237ad03500fe266f03503"
+CHECKSUM_SHA256="46cdeefef6bbf800e2e776630930fea6363107ac71460824ba54e37047eb85b8"
+SOURCE_DIR="orcus-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-boostMinimumVersion=1.83.0
+boostMinimumVersion=1.88.0
 
 commandBinDir=$binDir
 commandSuffix=$secondaryArchSuffix
@@ -22,10 +23,10 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 fi
 
 soVersion="${portVersion%.*}"
-ixionSoVersion=$soVersion
+ixionSoVersion="${portVersion%.*}" # keep on par with ixion
 
 PROVIDES="
-	orcus$secondaryArchSuffix = $portVersion
+	orcus0.20$secondaryArchSuffix = $portVersion
 	lib:liborcus_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liborcus_mso_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liborcus_parser_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
@@ -43,19 +44,19 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	orcus${secondaryArchSuffix}_devel = $portVersion
+	orcus0.20${secondaryArchSuffix}_devel = $portVersion
 	devel:liborcus_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	devel:liborcus_mso_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	devel:liborcus_parser_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	devel:liborcus_spreadsheet_model_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES_devel="
-	orcus$secondaryArchSuffix == $portVersion base
+	orcus0.20$secondaryArchSuffix == $portVersion base
 	devel:libixion_$ixionSoVersion$secondaryArchSuffix
 	"
 
 PROVIDES_tools="
-	orcus${secondaryArchSuffix}_tools = $portVersion
+	orcus0.20${secondaryArchSuffix}_tools = $portVersion
 	cmd:orcus_css_dump$commandSuffix = $portVersion
 	cmd:orcus_csv$commandSuffix = $portVersion
 	cmd:orcus_detect$commandSuffix = $portVersion
@@ -72,9 +73,13 @@ PROVIDES_tools="
 	cmd:orcus_zip_dump$commandSuffix = $portVersion
 	"
 REQUIRES_tools="
-	orcus$secondaryArchSuffix == $portVersion base
+	orcus0.20$secondaryArchSuffix == $portVersion base
 	$REQUIRES
 	"
+CONFLICTS_tools="
+	orcus${secondaryArchSuffix}_tools
+	orcus0.18${secondaryArchSuffix}_tools
+	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -85,12 +90,13 @@ BUILD_REQUIRES="
 	devel:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion
 	devel:libixion_$ixionSoVersion$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:mdds >= 2
+	devel:mdds >= 3.0
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:doxygen
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -98,7 +104,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-defineDebugInfoPackage orcus$secondaryArchSuffix \
+defineDebugInfoPackage orcus0.20$secondaryArchSuffix \
 	$(getPackagePrefix tools)/bin/orcus-css-dump \
 	$(getPackagePrefix tools)/bin/orcus-csv \
 	$(getPackagePrefix tools)/bin/orcus-detect \
@@ -126,18 +132,25 @@ PATCH()
 BUILD()
 {
 	autoreconf -fi
+	export CXXFLAGS="-std=c++17 -O2 -g"
 	BOOST_ROOT=$portPackageLinksDir/devel~libboost_program_options/develop
 	runConfigure --omit-dirs binDir ./configure \
 		--bindir=$commandBinDir \
 		--disable-python \
 		--disable-static
 	make $jobArgs
+	make doc-doxygen
 }
 
 INSTALL()
 {
 	make install
 
+	# documentation
+	docdir="$developDir/documentation/orcus${portVersion%.*}"
+	mkdir -p $docdir
+	cp -r doc/_doxygen/html $docdir
+
 	for la in "" -mso -parser -spreadsheet-model; do
 		library=liborcus$la-$soVersion
 		rm $libDir/$library.la